summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-04-09 00:48:15 +0200
committerRobin Gareus <robin@gareus.org>2013-04-09 04:05:34 +0200
commit8a3ebe7510195b7d7f2c3eba3ae75b0e76b8db70 (patch)
tree12a55c9e15b4c2afe01d53e1f337be8fa18f0194 /gtk2_ardour
parentf7abf2de82d2bf97eaa7395b7056771197f1fe36 (diff)
vtl: resume if "don't close/exit" is selected
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc1
-rw-r--r--gtk2_ardour/ardour_ui_dialogs.cc5
2 files changed, 6 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index c29c8136a0..83931816be 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -849,6 +849,7 @@ ARDOUR_UI::finish()
actions.push_back (_("Save and quit"));
switch (ask_about_saving_session(actions)) {
case -1:
+ ARDOUR_UI::instance()->video_timeline->set_session(_session);
return;
break;
case 1:
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 2789c37464..fb31ba513a 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -217,6 +217,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
{
#ifdef WITH_VIDEOTIMELINE
if (_session) {
+ /* close video-monitor
+ * this needed to enfore querying its settings (window size,..)
+ * which are reported asynchroneously.
+ */
ARDOUR_UI::instance()->video_timeline->close_session();
}
#endif
@@ -227,6 +231,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
actions.push_back (_("Save and close"));
switch (ask_about_saving_session (actions)) {
case -1:
+ ARDOUR_UI::instance()->video_timeline->set_session(_session);
// cancel
return 1;