2 files changed, 2 insertions, 5 deletions
diff --git a/src/modules/chat/chat.h b/src/modules/chat/chat.h
index fbe96ac805..1ba8c46f69 100644
--- a/src/modules/chat/chat.h
+++ b/src/modules/chat/chat.h
@@ -39,7 +39,7 @@ extern HGENMENU hJoinMenuItem, hLeaveMenuItem;
 extern GlobalLogSettingsBase *g_Settings;
 extern int g_cbSession, g_cbModuleInfo, g_iFontMode, g_iChatLang;
 extern TCHAR *g_szFontGroup;
-extern CRITICAL_SECTION cs;
+extern mir_cs cs;
 
 extern PBYTE pLogIconBmpBits[14];
 extern int logIconBmpSize[14];
diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp
index 1239b624b0..211e913d83 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/modules/chat/chat_svc.cpp
@@ -27,7 +27,7 @@ INT_PTR SvcGetChatManager(WPARAM, LPARAM);
 #include "chat.h"
 
 HGENMENU hJoinMenuItem, hLeaveMenuItem;
-CRITICAL_SECTION cs;
+mir_cs cs;
 
 static HANDLE
    hServiceRegister = NULL,
@@ -583,8 +583,6 @@ static bool bInited = false;
 
 int LoadChatModule(void)
 {
-	InitializeCriticalSection(&cs);
-
 	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
 	HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged);
@@ -620,7 +618,6 @@ void UnloadChatModule(void)
 	
 	FreeMsgLogBitmaps();
 	OptionsUnInit();
-	DeleteCriticalSection(&cs);
 
 	DestroyHookableEvent(ci.hSendEvent);
 	DestroyHookableEvent(ci.hBuildMenuEvent);