From 0d65ec3aab2c63b9a55fbabc811b0e23447fd4a1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 15 Jul 2015 21:27:18 +0000 Subject: - fix for memory corruption; - code cleaning; - version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@14577 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbEditorPP/src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/DbEditorPP/src/main.cpp') diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index dbf1610cb6..8f6b19d14c 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -5,8 +5,8 @@ HINSTANCE hInst = NULL; MIDatabase *g_db; HANDLE hTTBButt = NULL; -BOOL bServiceMode = FALSE; -BOOL usePopups; +bool g_bServiceMode = false; +bool g_bUsePopups; int hLangpack; BYTE nameOrder[NAMEORDERCOUNT]; @@ -63,11 +63,11 @@ int DBSettingChanged(WPARAM hContact, LPARAM lParam) settingChanged(hContact, cws->szModule, cws->szSetting, &(cws->value)); // watch list - if (!hwnd2watchedVarsWindow && !usePopups) + if (!hwnd2watchedVarsWindow && !g_bUsePopups) return 0; if (WatchedArrayIndex(hContact, cws->szModule, cws->szSetting, 0) >= 0) { - if (usePopups) popupWatchedVar(hContact, cws->szModule, cws->szSetting); + if (g_bUsePopups) popupWatchedVar(hContact, cws->szModule, cws->szSetting); PopulateWatchedWindow(); } @@ -138,7 +138,7 @@ int ModulesLoaded(WPARAM, LPARAM) hkd.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_EXT, 'D'); Hotkey_Register(&hkd); - usePopups = db_get_b(NULL, modname, "UsePopUps", 0); + g_bUsePopups = db_get_b(NULL, modname, "UsePopUps", 0) != 0; // Load the name order for (int i = 0; i < NAMEORDERCOUNT; i++) @@ -152,7 +152,7 @@ int ModulesLoaded(WPARAM, LPARAM) HookEvent(ME_TTB_MODULELOADED, OnTTBLoaded); - if (bServiceMode) + if (g_bServiceMode) CallService("DBEditorpp/MenuCommand", 0, 0); return 0; } @@ -167,7 +167,7 @@ int PreShutdown(WPARAM, LPARAM) INT_PTR ServiceMode(WPARAM, LPARAM) { IcoLibRegister(); - bServiceMode = TRUE; + g_bServiceMode = true; HookEvent(ME_DB_CONTACT_SETTINGCHANGED, DBSettingChanged); -- cgit v1.2.3