Fix Group assign to new VCA
authorRobin Gareus <robin@gareus.org>
Sat, 18 Mar 2017 21:50:35 +0000 (22:50 +0100)
committerRobin Gareus <robin@gareus.org>
Sat, 18 Mar 2017 22:06:42 +0000 (23:06 +0100)
For reasons unknown[1], The vca-counter may not be in sync with
actual number of VCAs present.

[1] possibly some shared-ptr references at the time of session-save, or
old session compatibility.

gtk2_ardour/group_tabs.cc

index 0728c33046bc79115d2bcea7da6bf8b7fae5d027..85a4dc8d200cc92937d5d7cc9ed4661f4493effb 100644 (file)
@@ -444,8 +444,8 @@ GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool renam
                        return;
                }
 
-               /* VCAs use 1-based counting. Get most recently created VCA... */
-               which = _session->vca_manager().n_vcas();
+               /* Get most recently created VCA... */
+               which = _session->vca_manager().vcas().back()->number();
        }
 
        master = _session->vca_manager().vca_by_number (which);
@@ -480,8 +480,8 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
                        return;
                }
 
-               /* VCAs use 1-based counting. Get most recently created VCA... */
-               which = _session->vca_manager().n_vcas();
+               /* Get most recently created VCA... */
+               which = _session->vca_manager().vcas().back()->number();
        }
 
        master = _session->vca_manager().vca_by_number (which);