Fix win32 jthread implementation

diff --git a/src/jthread/win32/jsemaphore.cpp b/src/jthread/win32/jsemaphore.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8eca6d2..3a1f271
--- a/src/jthread/win32/jsemaphore.cpp
+++ b/src/jthread/win32/jsemaphore.cpp
@@ -27,7 +27,7 @@ JSemaphore::JSemaphore() {
 }
 
 JSemaphore::~JSemaphore() {
-       CloseHandle(&m_hSemaphore);
+       CloseHandle(m_hSemaphore);
 }
 
 JSemaphore::JSemaphore(int initval) {

diff --git a/src/jthread/win32/jthread.cpp b/src/jthread/win32/jthread.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 0781982..6a745c5
--- a/src/jthread/win32/jthread.cpp
+++ b/src/jthread/win32/jthread.cpp
@@ -46,14 +46,21 @@ JThread::~JThread()
 
 void JThread::Stop() {
        runningmutex.Lock();
-       requeststop = false;
+       requeststop = true;
        runningmutex.Unlock();
 }
 
 void JThread::Wait() {
-       int WaitForSingleObject_retval = WaitForSingleObject(threadhandle, INFINITE);
-       assert(WaitForSingleObject_retval == 0);
-       UNUSED(WaitForSingleObject_retval);
+       runningmutex.Lock();
+       if (running)
+       {
+               runningmutex.Unlock();
+               WaitForSingleObject(threadhandle, INFINITE);
+       }
+       else
+       {
+               runningmutex.Unlock();
+       }
 }
 
 int JThread::Start()