diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-03 13:38:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-03 13:38:21 +0000 |
| commit | d5b13692582e014c02dff75bf85ae6765d762dc4 (patch) | |
| tree | 38f8fb2e368e3c22404338d6ccffdbe3805ba59c /gtk2_ardour/mixer_ui.cc | |
| parent | c1f85106cc8dc8e9234b3774e2457c0adcfbeabd (diff) | |
probable fix for track sync-ordering, part II to come in a minute
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3850 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 107ebe532a..b6b230e13b 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -71,7 +71,6 @@ Mixer_UI::Mixer_UI () in_group_row_change = false; _visible = false; ignore_route_reorder = false; - ignore_sync = false; Route::SyncOrderKeys.connect (mem_fun (*this, &Mixer_UI::sync_order_keys)); @@ -355,13 +354,13 @@ Mixer_UI::get_order_key() void -Mixer_UI::sync_order_keys () +Mixer_UI::sync_order_keys (void *src) { vector<int> neworder; TreeModel::Children rows = track_model->children(); TreeModel::Children::iterator ri; - if (ignore_sync || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { + if (src == this || !session || (session->state_of_the_state() & Session::Loading) || rows.empty()) { return; } @@ -712,15 +711,14 @@ Mixer_UI::redisplay_track_list () } if (Config->get_sync_all_route_ordering() && !ignore_route_reorder) { - ignore_sync = true; - Route::SyncOrderKeys (); // EMIT SIGNAL - ignore_sync = false; + Route::SyncOrderKeys (this); // EMIT SIGNAL } // Rebind all of the midi controls automatically - if (auto_rebinding) + if (auto_rebinding) { auto_rebind_midi_controls (); + } } |