ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Do not restore engine state if we don't have control 

When connecting to already running jack, display jack's buffersize
correctly.
This commit is contained in:
Robin Gareus 2015-10-06 14:40:51 +02:00
parent b1609b53bd
commit 8431d102b9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/engine_dialog.cc
View File

@ -1016,6 +1016,11 @@ EngineControl::backend_changed ()
*/
engine_stopped (); // set "active/inactive"
if (!_have_control) {
// set settings from backend that we do have control over
set_active_text_if_present (buffer_size_combo, bufsize_as_string (backend->buffer_size()));
}
if (!ignore_changes) {
maybe_display_saved_state ();
}
@ -2015,6 +2020,13 @@ EngineControl::set_current_state (const State& state)
// do the right thing
backend_combo.set_active_text (state->backend);
if (!ARDOUR::AudioEngine::instance()->setup_required ()) {
backend_changed ();
// we don't have control don't restore state
return true;
}
if (!state->driver.empty ()) {
if (!backend->requires_driver_selection ()) {
DEBUG_ECONTROL ("Backend should require driver selection");