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

when calling Session::engine_halted() after a user-driven engine stop, make sure Engine::running() will be false

Browse Source
This commit is contained in:
Paul Davis 2018-10-17 13:15:52 -04:00
parent 05d3539591
commit 70c0e34c4d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/audioengine.cc
View File

@ -968,7 +968,13 @@ AudioEngine::stop (bool for_latency)
pl.release ();
}
if (_session && _running && stop_engine &&
const bool was_running_will_stop = (_running && stop_engine);
if (was_running_will_stop) {
_running = false;
}
if (_session && was_running_will_stop &&
(_session->state_of_the_state() & Session::Loading) == 0 &&
(_session->state_of_the_state() & Session::Deletion) == 0) {
// it's not a halt, but should be handled the same way:
@ -976,8 +982,7 @@ AudioEngine::stop (bool for_latency)
_session->engine_halted ();
}
if (stop_engine && _running) {
_running = false;
if (was_running_will_stop) {
if (!for_latency) {
_started_for_latency = false;
} else if (!_started_for_latency) {