Be a bit safer with ThreadedStaticText.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 5a9986215585b6f0a8266f26c7faa1fcba0e5bc0..712e235700b5776a5dc18bedba260775795bed0a 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -65,7 +65,14 @@ ThreadedStaticText::ThreadedStaticText (wxWindow* parent, string initial, functi
        : wxStaticText (parent, wxID_ANY, std_to_wx (initial))
 {
        Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this);
-       thread t (bind (&ThreadedStaticText::run, this, fn));
+       _thread = new thread (bind (&ThreadedStaticText::run, this, fn));
+}
+
+ThreadedStaticText::~ThreadedStaticText ()
+{
+       /* XXX: this is a bit unfortunate */
+       _thread->join ();
+       delete _thread;
 }
 
 void