diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-28 21:44:20 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-28 21:44:20 +0000 |
commit | 991b9136bb5b8cd7981588195ed0566b0045054b (patch) | |
tree | f0af1299e0bcd7aaf8611ecd1d4b8ac39c0047d0 | |
parent | 4851c54a7b514473a69ddcc63b7eae6fc56a62e4 (diff) |
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
-rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 4 | ||||
-rw-r--r-- | libs/ardour/session.cc | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index bf096f86c1..0603fc6baa 100644 --- 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 7e3b061656..0cc00bc754 100644 --- 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 */ |