forward port 2.X changes up to and including rev 6714

git-svn-id: svn://localhost/ardour2/branches/3.0@7635 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 14 insertions, 0 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b28bccbc94..72adc4305b 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -733,6 +733,19 @@ ARDOUR_UI::check_memory_locking ()
 
 
 void
+ARDOUR_UI::queue_finish ()
+{
+	Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::idle_finish));
+}
+
+bool
+ARDOUR_UI::idle_finish ()
+{
+	finish ();
+	return false; /* do not call again */
+}
+
+void
 ARDOUR_UI::finish()
 {
 	if (_session) {
@@ -772,6 +785,7 @@ If you still wish to quit, please use the\n\n\
 		point_oh_five_second_connection.disconnect ();
 		point_zero_one_second_connection.disconnect();
 		
+                _session->set_clean ();
 		// _session->set_deletion_in_progress ();
 		_session->remove_pending_capture_state ();
 		delete _session;