fix meterbridge window behaviour on session unload/close.

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 7f72725af8298fbc99b8a5fb5e15cfe6020cee71..77fab156bb52e48473f04cb35359da8496798ee4 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -214,6 +214,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        editor = 0;
        mixer = 0;
+       meterbridge = 0;
        editor = 0;
        engine = 0;
        _session_is_new = false;
@@ -510,6 +511,7 @@ ARDOUR_UI::~ARDOUR_UI ()
        delete keyboard;
        delete editor;
        delete mixer;
+       delete meterbridge;
 
        stop_video_server();
 }

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 4ed563e2017bb650b329d7c31809a16167b9f1e9..b988fd56fa32256d1f0d4fe48d24ffd3fdc9d2ae 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -212,6 +212,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        if (hide_stuff) {
                editor->hide ();
                mixer->hide ();
+               meterbridge->hide ();
                theme_manager->hide ();
                audio_port_matrix->hide();
                midi_port_matrix->hide();

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 94cb9f2c177d2fff26192422197292d55905628f..835b11c4a6d4ac8a0828502c29fa1e3ba67d59fd 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -603,7 +603,7 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
 void
 ARDOUR_UI::save_ardour_state ()
 {
-       if (!keyboard || !mixer || !editor) {
+       if (!keyboard || !mixer || !editor || !meterbridge) {
                return;
        }