diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-19 19:04:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-19 19:04:41 +0300 |
| commit | 03abc0234e40183256bba3d2b9cdf809d92363f2 (patch) | |
| tree | 794b80410ddb80d57094dd58706c37b4e0c27a6b /plugins/TabSRMM | |
| parent | 212d14abad9935d580e7073088af0f428792bdfb (diff) | |
minor code cleaning
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/globals.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/stdafx.h | 1 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/themes.cpp | 2 |
3 files changed, 1 insertions, 6 deletions
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();
|