summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-22 11:19:34 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-22 11:19:34 -0400
commit20f28c82ecec7725b0fb98dfe0539c0710328678 (patch)
treed1c5e8aaf9cc4fd3c9da7c0df019f9d7a2871ca0
parent04d66a9e3ad2585b4bdd9ea3a022582ec2b9d428 (diff)
make session creation from a template work again
-rw-r--r--gtk2_ardour/startup.cc3
-rw-r--r--libs/ardour/session_state.cc7
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index ff16d7c1e8..06befae7f5 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -203,9 +203,8 @@ ArdourStartup::use_session_template ()
}
if (use_template_button.get_active()) {
- return template_chooser.get_active_row_number() > 0;
+ return true;
}
-
return false;
}
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index c33fd91b5d..049cb5b5ee 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -493,9 +493,10 @@ Session::create (const string& session_template, BusProfile* bus_profile)
ifstream in(in_path.c_str());
if (in) {
- string out_path = _path;
- out_path += _name;
- out_path += statefile_suffix;
+ /* no need to call legalize_for_path() since the string
+ * in session_template is already a legal path name
+ */
+ string out_path = Glib::build_filename (_session_dir->root_path(), _name + statefile_suffix);
ofstream out(out_path.c_str());