ardour/livetrax
13
0
Fork 0
Code

Don't hide Audio Setup dialog when clicking 'OK' if engine fails to start

Browse Source 
This has to be handled in two places, in ARDOUR_UI::do_audio_midi_setup and in
the dialogs response handler and in as the window can also be triggered via the
window action manager.
This commit is contained in:
Tim Mayberry 2015-09-26 20:22:46 +10:00
parent 2768ce9b05
commit 463bd470e8
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/ardour_ui.cc
View File

@ -4828,13 +4828,21 @@ ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate)
audio_midi_setup->set_desired_sample_rate (desired_sample_rate); audio_midi_setup->set_desired_sample_rate (desired_sample_rate);
audio_midi_setup->set_position (WIN_POS_CENTER); audio_midi_setup->set_position (WIN_POS_CENTER);
switch (audio_midi_setup->run()) { int response;
case Gtk::RESPONSE_OK:
return 0; while (true) {
case Gtk::RESPONSE_APPLY: response = audio_midi_setup->run();
return 0; switch (response) {
default: case Gtk::RESPONSE_OK:
return -1; if (!AudioEngine::instance()->running()) {
continue;
} else {
return 0;
}
return 0;
default:
return -1;
}
} }
} }

15
gtk2_ardour/engine_dialog.cc
View File

@ -415,10 +415,12 @@ EngineControl::on_response (int response_id)
switch (response_id) { switch (response_id) {
case RESPONSE_OK: case RESPONSE_OK:
if (push_state_to_backend (true) != 0) {
return;
} else {
hide ();
}
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
// For some reason we don't understand, 'hide()'
// needs to get called first in Windows
hide ();
// But if there's no session open, this can produce // But if there's no session open, this can produce
// a long gap when nothing appears to be happening. // a long gap when nothing appears to be happening.
@ -430,13 +432,8 @@ EngineControl::on_response (int response_id)
} }
} }
} }
push_state_to_backend (true);
break;
#else
push_state_to_backend (true);
hide ();
break;
#endif #endif
break;
case RESPONSE_DELETE_EVENT: case RESPONSE_DELETE_EVENT:
{ {
GdkEventButton ev; GdkEventButton ev;