summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_ui.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-07-12 11:02:12 +0000
committerCarl Hetherington <carl@carlh.net>2011-07-12 11:02:12 +0000
commit6ae03aa212845614ec296daf413b104ad61d3dd4 (patch)
tree722acfb11515b4c79b384397fe922eee6ece30fa /gtk2_ardour/mixer_ui.cc
parent6dc74f8c871752b05eb7def894bd44e38d76c3f4 (diff)
Maintain order keys even when routes are hidden, to prevent
git-svn-id: svn://localhost/ardour2/branches/3.0@9844 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
-rw-r--r--gtk2_ardour/mixer_ui.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 0e6d21b7fc..cedf65ae80 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -747,15 +747,14 @@ Mixer_UI::redisplay_track_list ()
continue;
}
- bool visible = (*i)[track_columns.visible];
+ if (!strip_redisplay_does_not_reset_order_keys) {
+ strip->route()->set_order_key (N_("signal"), order);
+ }
+
+ bool const visible = (*i)[track_columns.visible];
if (visible) {
strip->set_gui_property ("visible", true);
- strip->route()->set_order_key (N_("signal"), order);
-
- if (!strip_redisplay_does_not_reset_order_keys) {
- strip->route()->set_order_key (N_("signal"), order);
- }
if (strip->packed()) {
@@ -773,7 +772,6 @@ Mixer_UI::redisplay_track_list ()
strip_packer.pack_start (*strip, false, false);
}
strip->set_packed (true);
- //strip->show();
}
} else {
@@ -797,8 +795,9 @@ Mixer_UI::redisplay_track_list ()
// Resigc::bind all of the midi controls automatically
- if (auto_rebinding)
+ if (auto_rebinding) {
auto_rebind_midi_controls ();
+ }
_group_tabs->set_dirty ();
}