summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_mixer.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-01-08 03:29:06 +0100
committerRobin Gareus <robin@gareus.org>2014-01-08 03:29:06 +0100
commit382eb0fc6842f202901245709534477b90bda461 (patch)
treedd0729234fc05c7d638431e3a4a19c3c26305e52 /gtk2_ardour/editor_mixer.cc
parentc4cdf61971a7190bc63db96ad6128f4598ebc265 (diff)
fix issue with editor-mixer:
* width+processor box display: - show editor-mixer - hide editor-mixer - select a different track or bus - show editor mixer -> width is wrong, processor may be displayed w/1px height * no routes on initial display -> possible segfault
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
-rw-r--r--gtk2_ardour/editor_mixer.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 37654913eb..175c553615 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -133,17 +133,19 @@ Editor::show_editor_mixer (bool yn)
if (current_mixer_strip == 0) {
create_editor_mixer ();
}
-
- current_mixer_strip->set_route (r);
- current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
}
- if (current_mixer_strip->get_parent() == 0) {
+ if (current_mixer_strip && current_mixer_strip->get_parent() == 0) {
global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
global_hpacker.reorder_child (*current_mixer_strip, 0);
current_mixer_strip->show ();
}
+ if (r) {
+ current_mixer_strip->set_route (r);
+ current_mixer_strip->set_width_enum (editor_mixer_strip_width, (void*) this);
+ }
+
} else {
if (current_mixer_strip) {