mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-20 13:46:30 +01:00
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
This commit is contained in:
parent
43a43437bc
commit
eb8fa64dff
2 changed files with 4 additions and 4 deletions
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue