diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-23 19:28:17 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-23 19:28:17 +0000 |
| commit | 41d3f3519c077b061c03fc0f50b4d4bded0d1e28 (patch) | |
| tree | 11ccc5ce6fbd5fdb0c66d6ea84d7835beba13786 | |
| parent | 28368793415ba934132994d8c10a5e149c1a8d9d (diff) | |
misc. startup/session load fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@5000 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/startup.cc | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ee61f7ada9..299bb38523 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -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; diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index c23f69164f..876f96b290 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -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 (); |