4 files changed, 1 insertions, 8 deletions
diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp
index 0b70c4aa66..cd9da5c4bc 100644
--- a/plugins/QuickMessages/src/main.cpp
+++ b/plugins/QuickMessages/src/main.cpp
@@ -25,7 +25,6 @@ int hLangpack;
 WNDPROC mainProc;
 
 int g_iButtonsCount=0;
-int g_bShutDown=0;
 int g_bStartup=0;
 BOOL g_bRClickAuto=0;
 BOOL g_bLClickAuto=0;
@@ -46,7 +45,6 @@ PLUGININFOEX pluginInfo = {
 
 int PreShutdown(WPARAM, LPARAM)
 {
-	g_bShutDown = 1;
 	DestructButtonsList();
 	return 0;
 }
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 6ab4e3d396..6935c5f924 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -32,8 +32,6 @@
 void Chat_ModulesLoaded();
 void CB_InitCustomButtons();
 
-bool g_bShutdown = false;
-
 CGlobals PluginConfig;
 
 static TContainerSettings _cnt_default = { CNT_FLAGS_DEFAULT, CNT_FLAGSEX_DEFAULT, 255, CInfoPanel::DEGRADE_THRESHOLD, 60, 60, L"%n (%s)", 1, 0 };
@@ -450,8 +448,6 @@ int CGlobals::MetaContactEvent(WPARAM hContact, LPARAM)
 
 int CGlobals::PreshutdownSendRecv(WPARAM, LPARAM)
 {
-	g_bShutdown = true;
-
 	::TN_ModuleDeInit();
 	::CloseAllContainers();
 
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 3318f05af7..2e28832839 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -232,7 +232,6 @@ extern char *TemplateNames[];
 extern HANDLE hUserPrefsWindowList;
 extern TCpTable cpTable[];
 extern HMODULE g_hIconDLL;
-extern bool g_bShutdown;
 
 extern pfnDoPopup oldDoPopup, oldLogToFile;
 extern pfnDoTrayIcon oldDoTrayIcon;
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 1a94eed47f..fb7c3ce8c2 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1172,7 +1172,7 @@ void CSkin::Unload()
 			::DestroyIcon(*(m_skinIcons[i].phIcon));
 	mir_free(m_skinIcons);
 
-	if (!g_bShutdown) {
+	if (!Miranda_IsTerminated()) {
 		M.getAeroState();				// refresh after unload
 		::FreeTabConfig();
 		::ReloadTabConfig();