allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

misc. startup/session load fixes

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5000 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2009-04-23 19:28:17 +00:00
parent 2836879341
commit 41d3f3519c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/ardour_ui.cc
View File

@@ -2286,12 +2286,14 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
break;
}
session_path = Glib::build_filename (session_path, session_name);
if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
if (likely_new) {
if (!ask_about_loading_existing_session (session_path)) {
ustring existing = Glib::build_filename (session_path, session_name);
if (!ask_about_loading_existing_session (existing)) {
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
continue;
}
}
@@ -2301,8 +2303,7 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
} else {
if (!likely_new) {
MessageDialog msg (string_compose (_("There is no existing session called \"%1\""),
ARDOUR_COMMAND_LINE::session_name));
MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
msg.run ();
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
continue;

4
gtk2_ardour/startup.cc
View File

@@ -151,7 +151,9 @@ ArdourStartup::use_session_template ()
Glib::ustring
ArdourStartup::session_template_name ()
{
string ret;
if (ic_existing_session_button.get_active()) {
return ustring();
}
if (use_template_button.get_active()) {
TreeModel::iterator iter = template_chooser.get_active ();