1 files changed, 4 insertions, 3 deletions
diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index 1dd20900a8..002742a66c 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -27,9 +27,10 @@ INT_PTR SvcGetChatManager(WPARAM, LPARAM);
 #include "chat.h"
 #include "resource.h"
 
+mir_cs csChat;
 HMENU g_hMenu = nullptr;
 HGENMENU hJoinMenuItem, hLeaveMenuItem;
-mir_cs csChat;
+MWindowList g_hWindowList;
 
 static HANDLE
    hServiceRegister = nullptr,
@@ -777,7 +778,7 @@ int LoadChatModule(void)
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
 	HookEvent(ME_SKIN_ICONSCHANGED, IconsChanged);
 
-	chatApi.hWindowList = WindowList_Create();
+	g_hWindowList = WindowList_Create();
 	chatApi.hSendEvent = CreateHookableEvent(ME_GC_EVENT);
 	chatApi.hBuildMenuEvent = CreateHookableEvent(ME_GC_BUILDMENU);
 	hHookEvent = CreateHookableEvent(ME_GC_HOOK_EVENT);
@@ -803,7 +804,7 @@ void UnloadChatModule(void)
 	FreeMsgLogBitmaps();
 	OptionsUnInit();
 
-	WindowList_Destroy(chatApi.hWindowList);
+	WindowList_Destroy(g_hWindowList);
 
 	DestroyHookableEvent(chatApi.hSendEvent);
 	DestroyHookableEvent(chatApi.hBuildMenuEvent);