From 78b8eaf565a34df551bcac2b839a9defe9681ea0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 8 May 2010 16:47:57 +0000 Subject: [PATCH] save global state when quitting BEFORE we stop the engine, so that global MIDI ports are still connected and thus will re-establish their connections on session reload git-svn-id: svn://localhost/ardour2/branches/3.0@7082 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour_ui.cc | 5 +++-- libs/ardour/io.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 4b2f0961d1..5404432c37 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -769,10 +769,11 @@ If you still wish to quit, please use the\n\n\ _session = 0; } - ArdourDialog::close_all_dialogs (); - engine->stop (true); cerr << "Save before quit\n"; save_ardour_state (); + + ArdourDialog::close_all_dialogs (); + engine->stop (true); quit (); } diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 8b52bfaea5..36cc25a315 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -869,12 +869,12 @@ IO::make_connections (const XMLNode& node, int version, bool in) if ((prop = cnode->property (X_("other"))) == 0) { continue; } - + if (prop) { p->connect (prop->value()); } } - } + } } }