From: Robin Gareus <robin@gareus.org>
Date: Mon, 8 Apr 2013 22:48:15 +0000 (+0200)
Subject: vtl: resume if "don't close/exit" is selected
X-Git-Tag: 3.2~87^2~3
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=8a3ebe7510195b7d7f2c3eba3ae75b0e76b8db70;p=ardour.git

vtl: resume if "don't close/exit" is selected
---

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;