2 files changed, 4 insertions, 13 deletions
diff --git a/plugins/CryptoPP/src/commonheaders.h b/plugins/CryptoPP/src/commonheaders.h
index 2d9723616e..b5b5a9bb19 100644
--- a/plugins/CryptoPP/src/commonheaders.h
+++ b/plugins/CryptoPP/src/commonheaders.h
@@ -65,7 +65,7 @@ extern PLUGININFOEX pluginInfoEx;
 extern HANDLE hPGPPRIV;
 extern HANDLE hRSA4096;
 
-extern CRITICAL_SECTION localQueueMutex;
+extern mir_cs localQueueMutex;
 
 void ExtractFile(char*,int,int);
 size_t rtrim(LPCSTR);
diff --git a/plugins/CryptoPP/src/main.cpp b/plugins/CryptoPP/src/main.cpp
index 45e8a8f6c1..e6dfac13f3 100644
--- a/plugins/CryptoPP/src/main.cpp
+++ b/plugins/CryptoPP/src/main.cpp
@@ -8,8 +8,8 @@ HINSTANCE g_hInst;
 HANDLE hPGPPRIV = NULL;
 HANDLE hRSA4096 = NULL;
 
-CRITICAL_SECTION localQueueMutex;
-CRITICAL_SECTION localContextMutex;
+mir_cs localQueueMutex;
+mir_cs localContextMutex;
 
 PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
@@ -27,16 +27,7 @@ PLUGININFOEX pluginInfoEx = {
 
 BOOL WINAPI DllMain(HINSTANCE hInst, DWORD dwReason, LPVOID)
 {
-	if (dwReason == DLL_PROCESS_ATTACH) {
-		g_hInst = hInst;
-		InitializeCriticalSection(&localQueueMutex);
-		InitializeCriticalSection(&localContextMutex);
-	}
-	else if (dwReason == DLL_PROCESS_DETACH) {
-		DeleteCriticalSection(&localQueueMutex);
-		DeleteCriticalSection(&localContextMutex);
-	}
-
+	g_hInst = hInst;
 	return TRUE;
 }