allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

fix crash in butler when destroying before thread is started

Browse Source
This commit is contained in:
Paul Davis
2014-05-01 12:27:26 -04:00
parent cd00429672
commit e69531b953
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/butler.h
View File

@@ -76,6 +76,7 @@ class LIBARDOUR_API Butler : public SessionHandleRef
};
pthread_t thread;
bool have_thread;
Glib::Threads::Mutex request_lock;
Glib::Threads::Cond paused;
bool should_run;

11
libs/ardour/butler.cc
View File

@@ -43,6 +43,7 @@ namespace ARDOUR {
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)
@@ -126,16 +127,18 @@ Butler::start_thread()
}
//pthread_detach (thread);
have_thread = true;
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 *