fixed (rare but fatal) bug in wxWindowDisabler

[wxWidgets.git] / src / qt / threadsgi.cpp

diff --git a/src/qt/threadsgi.cpp b/src/qt/threadsgi.cpp
index 3503e79616da18ce44d6ac9d691944ef9178a9e1..66b6b0da7b21b0a62ce8403fb5390eaa7c9c5947 100644 (file)
--- a/src/qt/threadsgi.cpp
+++ b/src/qt/threadsgi.cpp
@@ -34,7 +34,7 @@ enum thread_state {
 /////////////////////////////////////////////////////////////////////////////
 
 static int p_mainid;
 /////////////////////////////////////////////////////////////////////////////
 
 static int p_mainid;

-wxMutex wxMainMutex;
+wxMutex *wxMainMutex;

 
 #include "threadgui.inc"
 
 
 #include "threadgui.inc"
 


@@ -166,10 +166,10 @@ void *wxThread::Join()
     int stat;
 
     if (do_unlock)
     int stat;
 
     if (do_unlock)

-      wxMainMutex.Unlock();
+      wxMainMutex->Unlock();

     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)
     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)

-      wxMainMutex.Lock();
+      wxMainMutex->Lock();

     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;
     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;


@@ -238,14 +238,16 @@ class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
   virtual bool OnInit() {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
   virtual bool OnInit() {

+    wxMainMutex = new wxMutex();

     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxThreadGuiInit();
     p_mainid = (int)getpid();

-    wxMainMutex.Lock();
+    wxMainMutex->Lock();

   }
 
   virtual void OnExit() {
   }
 
   virtual void OnExit() {

-    wxMainMutex.Unlock();
+    wxMainMutex->Unlock();

     wxThreadGuiExit();
     wxThreadGuiExit();

+    delete wxMainMutex;

   }
 };
 
   }
 };