projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DummyBackend: fix midi event mux+sorting
[ardour.git]
/
libs
/
ardour
/
butler.cc
diff --git
a/libs/ardour/butler.cc
b/libs/ardour/butler.cc
index c9eb55a472579b152f1bbb53fad5b3aae346991e..327665441ea0c127ddaa02d44753b9b0a90da520 100644
(file)
--- a/
libs/ardour/butler.cc
+++ b/
libs/ardour/butler.cc
@@
-43,6
+43,7
@@
namespace ARDOUR {
Butler::Butler(Session& s)
: SessionHandleRef (s)
, thread()
Butler::Butler(Session& s)
: SessionHandleRef (s)
, thread()
+ , have_thread (false)
, audio_dstream_capture_buffer_size(0)
, audio_dstream_playback_buffer_size(0)
, midi_dstream_buffer_size(0)
, audio_dstream_capture_buffer_size(0)
, audio_dstream_playback_buffer_size(0)
, midi_dstream_buffer_size(0)
@@
-126,16
+127,18
@@
Butler::start_thread()
}
//pthread_detach (thread);
}
//pthread_detach (thread);
-
+ have_thread = true;
return 0;
}
void
Butler::terminate_thread ()
{
return 0;
}
void
Butler::terminate_thread ()
{
- void* status;
- queue_request (Request::Quit);
- pthread_join (thread, &status);
+ if (have_thread) {
+ void* status;
+ queue_request (Request::Quit);
+ pthread_join (thread, &status);
+ }
}
void *
}
void *