don't load history till all objects have reset state (post engine running)

git-svn-id: svn://localhost/ardour2/trunk@1167 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index bf096f86c1a729728c1dd4eeb0f66e6c2fb63e76..0603fc6baa5acb95ee365736ac18eb2be21734c1 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -79,10 +79,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
 {
        editor->connect_to_session (s);
        mixer->connect_to_session (s);
-
-       /* its safe to do this now */
-
-       s->restore_history (s->snap_name());
 }
 
 void

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 7e3b06165672113d9d615c29f7d694520e0b9337..0cc00bc754325d0baf7d6a29829bc9e6ffcb7fb8 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -835,6 +835,11 @@ Session::when_engine_running ()
                }
        }
 
+
+       /* its safe to do this now */
+
+       restore_history (snap_name());
+       
        _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty));
 
        /* hook us up to the engine */