diff options
Diffstat (limited to 'gtk2_ardour/audio_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index f47e0ec33f..18a0d12199 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -169,15 +169,21 @@ AudioTimeAxisView::set_state (const XMLNode& node) if ((ret = TimeAxisView::set_state (node)) != 0) { return ret; } - - if ((prop = node.property ("shown_editor")) != 0) { - if (prop->value() == "no") { - _marked_for_display = false; + + /* if the TimeAxisView had marked this not for display, + then do not allow this to override it. + */ + + if ((prop = node.property ("marked_for_display")) == 0) { + if ((prop = node.property ("shown_editor")) != 0) { + if (prop->value() == "no") { + _marked_for_display = false; + } else { + _marked_for_display = true; + } } else { _marked_for_display = true; } - } else { - _marked_for_display = true; } XMLNodeList nlist = node.children(); |