One more piece to the moving master puzzle.

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 2754ba3dd85e3e579b9d5e857b05baa0cc903721..89732537f703dc19b63ad83dd0a72cb92720adad 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -1042,12 +1042,17 @@ EditorRoutes::sync_presentation_info_from_treeview ()
                 * presentation order 1
                 */
                if ((count == 0) && master_is_first && (stripable->presentation_info().order()  == 1)) {
-                       master_is_first = false;
+                       master_is_first = false; // someone has moved master
                        order = 0;
                }
 
-               if (stripable->is_master() && (master_is_first == true)) {
-                       continue;
+               if (stripable->is_master() && master_is_first) {
+                       if (count) {
+                               continue;
+                       } else {
+                               count++;
+                               continue;
+                       }
                }
 
                if (order != stripable->presentation_info().order()) {