summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dialogs.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-10 15:21:24 +0200
committerRobin Gareus <robin@gareus.org>2013-07-10 15:27:17 +0200
commit40f8806c7dba1e38caffad9eb3c9a63a3c1f6154 (patch)
tree912a3bb92157dbf68493f0cb4b51554af7a8ffc8 /gtk2_ardour/ardour_ui_dialogs.cc
parent86ae4c5fc1ea7c5fe4b2a52ad9aa40ceb61441db (diff)
tweak window-proxy session-management logic
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dialogs.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index fd1139b9fc..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 ();