fixes for 2 of 3 "fit-tracks" problems; new feature: 12 "view-states" and bindings...

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f47e0ec33f64028539058b510854c84465313d64..18a0d12199bd7fc9893fc58febff652a3112b408 100644 (file)
--- 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();