13
0

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
This commit is contained in:
Paul Davis 2006-11-28 21:44:20 +00:00
parent 4851c54a7b
commit 991b9136bb
2 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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 */