From 04ad452bca6adf41024e2e19b2fced2ef3b145a0 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 1 Jul 2013 20:42:26 +0200 Subject: [PATCH] fix meterbridge window behaviour on session unload/close. --- gtk2_ardour/ardour_ui.cc | 2 ++ gtk2_ardour/ardour_ui_dialogs.cc | 1 + gtk2_ardour/ardour_ui_ed.cc | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 7f72725af8..77fab156bb 100644 --- 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 4ed563e201..b988fd56fa 100644 --- 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 94cb9f2c17..835b11c4a6 100644 --- 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; }