ardour/livetrax
13
0
Fork 0
Code

reenable loading of a statefile specified at commandline

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7211 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Torben Hohn 2010-06-02 14:36:50 +00:00
parent 9317a32179
commit b65fe35f67
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/session_state.cc
View File

@ -856,13 +856,17 @@ Session::load_state (string snapshot_name)
if (!state_was_pending) {
xmlpath = _session_dir->root_path();
xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix;
xmlpath /= snapshot_name;
}
if (!sys::exists (xmlpath)) {
error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg;
return 1;
}
if (!sys::exists (xmlpath)) {
xmlpath = _session_dir->root_path();
xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix;
if (!sys::exists (xmlpath)) {
error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg;
return 1;
}
}
state_tree = new XMLTree;