X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=5422bb9957e4a8e0d62e213c63da2491883869ec;hb=20311ed2f3024bf8408171e1bc894f4934142128;hp=b988fd56fa32256d1f0d4fe48d24ffd3fdc9d2ae;hpb=04ad452bca6adf41024e2e19b2fced2ef3b145a0;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index b988fd56fa..5422bb9957 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -65,9 +65,9 @@ ARDOUR_UI::set_session (Session *s)
 {
 	SessionHandlePtr::set_session (s);
 
-	WM::Manager::instance().set_session (s);
 
 	if (!_session) {
+		WM::Manager::instance().set_session (s);
 		/* Session option editor cannot exist across change-of-session */
 		session_option_editor.drop_window ();
 		/* Ditto for AddVideoDialog */
@@ -87,6 +87,8 @@ ARDOUR_UI::set_session (Session *s)
 		}
 	}
 
+	WM::Manager::instance().set_session (s);
+
 	AutomationWatch::instance().set_session (s);
 
 	if (shuttle_box) {
@@ -228,6 +230,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
 	rec_button.set_sensitive (false);
 
+	WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
 	ARDOUR_UI::instance()->video_timeline->close_session();
 
 	stop_blinking ();
@@ -328,7 +331,7 @@ ARDOUR_UI::toggle_meterbridge ()
 	if (tact->get_active()) {
 		meterbridge->show_window ();
 	} else {
-		meterbridge->hide ();
+		meterbridge->hide_window (NULL);
 	}
 }