summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-01-25 12:53:48 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2015-01-25 12:53:48 -0500
commit78ec211733056eecc25a68b97025cb50e0076cd3 (patch)
treee049b5d51d613772950bf198957852d75a01c508 /gtk2_ardour
parentbd3643a5976e1a7f2070a06beeb935deeb42fac4 (diff)
fix incorrect logic when loading session via NextStep document API
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index fb3ed4fd02..e0e048b9dc 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2643,17 +2643,14 @@ ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& sess
void
ARDOUR_UI::idle_load (const std::string& path)
{
- if (_session) {
- if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
- /* /path/to/foo => /path/to/foo, foo */
- load_session (path, basename_nosuffix (path));
- } else {
- /* /path/to/foo/foo.ardour => /path/to/foo, foo */
- load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
- }
+ ARDOUR_COMMAND_LINE::session_name = path;
+ if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
+ /* /path/to/foo => /path/to/foo, foo */
+ load_session (path, basename_nosuffix (path));
} else {
- ARDOUR_COMMAND_LINE::session_name = path;
+ /* /path/to/foo/foo.ardour => /path/to/foo, foo */
+ load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
}
}