From 9c595f8131967541808ae77bae842bd905db9caa Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 13 Jan 2014 12:02:00 +0100 Subject: delete 'big' 2d panner window, if panner changes to mono|stereo --- gtk2_ardour/panner2d.cc | 4 ---- gtk2_ardour/panner_ui.cc | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 9de8123ea8..6c37de164b 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -202,10 +202,6 @@ Panner2d::handle_state_change () { panconnect.drop_connections(); if (!panner_shell->panner()) { - /* we should really self-destruct the UI here - * -> * PannerUI::set_panner() -> delete - */ - queue_draw (); return; } diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 3602225c88..ab4279a154 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -231,11 +231,16 @@ PannerUI::setup_pan () _mono_panner = 0; if (!_panner) { + delete big_window; + big_window = 0; return; } if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_2in2out#ui") { + delete big_window; + big_window = 0; + boost::shared_ptr pannable = _panner->pannable(); _stereo_panner = new StereoPanner (_panshell); @@ -260,6 +265,8 @@ PannerUI::setup_pan () else if (_panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_1in2out#ui" || _panshell->panner_gui_uri() == "http://ardour.org/plugin/panner_balance#ui") { + delete big_window; + big_window = 0; boost::shared_ptr pannable = _panner->pannable(); boost::shared_ptr ac = pannable->pan_azimuth_control; -- cgit v1.2.3