diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-07 21:37:48 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-07 21:37:48 -0500 |
| commit | 36c233fe6ce570ce85224626ce7aba4a2607537f (patch) | |
| tree | e8c1f9f02766cf5f7ea10487967be2c17f49e906 /gtk2_ardour/editor_mixer.cc | |
| parent | c235d3da994aba4febd644afa09bd5c836c050d5 (diff) | |
| parent | 382eb0fc6842f202901245709534477b90bda461 (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
| -rw-r--r-- | gtk2_ardour/editor_mixer.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 128767fa9b..67e749de50 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) { |