summaryrefslogtreecommitdiff
path: root/libs/ardour/session.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-11-25 00:55:41 +0100
committerRobin Gareus <robin@gareus.org>2015-11-25 00:56:05 +0100
commit71520c743212de6d4e42fbdfd8bfbd0611600dae (patch)
tree44f296e679de75ad423f36c6fcecefecd9cde4a8 /libs/ardour/session.cc
parentff62cec27d710a5a25caf028010aadd5a4bf0bac (diff)
Prevent crash at session-close when analysing.
The Analyser only holds a weak-pointer the the Source, session-destruction frees the actual Source, which is fatal for any ongoing audio analysis. This fix simply waits for the current ongoing analysis to complete, ideally TransientDetector::run, EBUr128Analysis::run, OnsetDetector::run and AudioAnalyser::analyse could be interrupted. Alternate option: cancel the Analyser::work thread (and re-create with the every session).
Diffstat (limited to 'libs/ardour/session.cc')
-rw-r--r--libs/ardour/session.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ec8b6e14cc..856e89eced 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -544,6 +544,8 @@ Session::destroy ()
remove_pending_capture_state ();
+ Analyser::flush ();
+
_state_of_the_state = StateOfTheState (CannotSave|Deletion);
/* disconnect from any and all signals that we are connected to */