diff options
| author | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-12 23:45:50 +0000 |
| commit | e92c1669c1cdf857b8a3900abb9f891e6ca9fdad (patch) | |
| tree | f02725efdfd3473527cb7fa94471a7cff2528880 /gtk2_ardour/ardour_ui.cc | |
| parent | bf256c168170de1b9e1411bb563c571d67470c05 (diff) | |
Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.
git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 70dac73a59..ca77ccb903 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1341,7 +1341,6 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t } catch (...) { - cerr << "About to complain about JACK\n"; MessageDialog msg (*editor, _("There are insufficient JACK ports available\n\ to create a new track or bus.\n\ @@ -2270,7 +2269,7 @@ ARDOUR_UI::get_session_parameters (Glib::ustring predetermined_path, bool have_e if (session_name[0] == '/' || (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') || (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) { - cerr << "here\n"; + if (load_session (Glib::path_get_dirname (session_name), session_name)) { response = Gtk::RESPONSE_NONE; goto try_again; |