From 382eb0fc6842f202901245709534477b90bda461 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 8 Jan 2014 03:29:06 +0100 Subject: 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 --- gtk2_ardour/editor_mixer.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_mixer.cc') 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) { -- cgit v1.2.3