From bfdbaf6f3d1ebf0b255a715a0b0d6626e312eaa4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 23 Oct 2017 21:09:47 +0300
Subject: fix for a random crash on exit

---
 include/m_utils.h               | 2 +-
 src/mir_app/src/modules.cpp     | 3 +--
 src/mir_core/src/windowlist.cpp | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/m_utils.h b/include/m_utils.h
index 224fe5f859..567e9689a6 100644
--- a/include/m_utils.h
+++ b/include/m_utils.h
@@ -132,7 +132,7 @@ EXTERN_C MIR_CORE_DLL(MWindowList) WindowList_Create(void);
 /////////////////////////////////////////////////////////////////////////////////////////
 // destroys a window list
 
-EXTERN_C MIR_CORE_DLL(void) WindowList_Destroy(MWindowList hList);
+EXTERN_C MIR_CORE_DLL(void) WindowList_Destroy(MWindowList &hList);
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // adds a window to the specified window list
diff --git a/src/mir_app/src/modules.cpp b/src/mir_app/src/modules.cpp
index ff9117276b..e2ef701b02 100644
--- a/src/mir_app/src/modules.cpp
+++ b/src/mir_app/src/modules.cpp
@@ -166,7 +166,6 @@ int LoadDefaultModules(void)
 
 void UnloadDefaultModules(void)
 {
-	UnloadChatModule();
 	UnloadAccountsModule();
 	UnloadMetacontacts();
 	UnloadNewPlugins();
@@ -174,7 +173,7 @@ void UnloadDefaultModules(void)
 	UnloadSkinSounds();
 	UnloadSkinHotkeys();
 	UnloadSrmmModule();
-	//	UnloadErrorsModule();
+	UnloadChatModule();
 	UnloadIcoLibModule();
 	UnloadUtilsModule();
 	UnloadExtraIconsModule();
diff --git a/src/mir_core/src/windowlist.cpp b/src/mir_core/src/windowlist.cpp
index 335e3db5d8..7af092dc1d 100644
--- a/src/mir_core/src/windowlist.cpp
+++ b/src/mir_core/src/windowlist.cpp
@@ -47,9 +47,10 @@ MIR_CORE_DLL(MWindowList) WindowList_Create(void)
 	return new TWindowList();
 }
 
-MIR_CORE_DLL(void) WindowList_Destroy(MWindowList hList)
+MIR_CORE_DLL(void) WindowList_Destroy(MWindowList &hList)
 {
 	delete hList;
+	hList = nullptr;
 }
 
 MIR_CORE_DLL(int) WindowList_Add(MWindowList hList, HWND hwnd, MCONTACT hContact)
-- 
cgit v1.2.3