diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-16 14:54:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-08-16 14:54:06 +0000 |
| commit | eb8fa64dfff1234f8cff8d38bd6fb8c83ccd6f1c (patch) | |
| tree | 32b607f18388f37adeebebec6549a7071d58b788 | |
| parent | 43a43437bc4b62f325df09c44799f6cf5020dbcc (diff) | |
make NSD open correctly if open clicked from audio setup page
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2315 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/new_session_dialog.cc | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index bf7a3472d2..99a8c072f6 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -257,7 +257,6 @@ ARDOUR_UI::create_engine () engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name); } catch (AudioEngine::NoBackendAvailable& err) { backend_audio_error (); - cerr << "engine not started\n"; error << string_compose (_("Could not connect to JACK server as \"%1\""), ARDOUR_COMMAND_LINE::jack_client_name) << endmsg; exit (1); } @@ -1979,8 +1978,6 @@ ARDOUR_UI::new_session (Glib::ustring predetermined_path, bool have_engine) have_engine = true; } - cerr << "startingengine\n"; - create_engine (); /* now handle possible affirmative responses */ diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index d5d635dafc..d48a332cbc 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -491,7 +491,10 @@ NewSessionDialog::session_name() const } */ - if (m_notebook->get_current_page() == 0) { + int page = m_notebook->get_current_page(); + + if (page == 0 || page == 2) { + /* new or audio setup pages */ return Glib::filename_from_utf8(m_name->get_text()); } else { if (m_treeview->get_selection()->count_selected_rows() == 0) { |