1 files changed, 3 insertions, 16 deletions
diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index bf8658853..aac7b8b97 100644
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -99,9 +99,8 @@ class CoreExport Mutex
 	}
 };
 
-class ThreadQueueData
+class ThreadQueueData : public Mutex
 {
-	CRITICAL_SECTION mutex;
 	HANDLE event;
  public:
 	ThreadQueueData()
@@ -109,23 +108,11 @@ class ThreadQueueData
 		event = CreateEvent(NULL, false, false, NULL);
 		if (event == NULL)
 			throw CoreException("CreateEvent() failed in ThreadQueueData::ThreadQueueData()!");
-		InitializeCriticalSection(&mutex);
 	}
 
 	~ThreadQueueData()
 	{
 		CloseHandle(event);
-		DeleteCriticalSection(&mutex);
-	}
-
-	void Lock()
-	{
-		EnterCriticalSection(&mutex);
-	}
-
-	void Unlock()
-	{
-		LeaveCriticalSection(&mutex);
 	}
 
 	void Wakeup()
@@ -135,9 +122,9 @@ class ThreadQueueData
 
 	void Wait()
 	{
-		LeaveCriticalSection(&mutex);
+		Unlock();
 		WaitForSingleObject(event, INFINITE);
-		EnterCriticalSection(&mutex);
+		Lock();
 	}
 };