From 509b46f98375153fad4157ceb18a8999fd6294f4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 29 Mar 2018 19:52:35 +0300 Subject: major clutch removed with double service mode plugins launch --- plugins/Db3x_mmap/src/init.cpp | 2 +- plugins/DbEditorPP/src/main.cpp | 8 +++----- plugins/Import/src/main.cpp | 5 +---- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp index 1cca7c767d..3e3db8301b 100644 --- a/plugins/Db3x_mmap/src/init.cpp +++ b/plugins/Db3x_mmap/src/init.cpp @@ -102,7 +102,7 @@ LBL_Error: return nullptr; } - if (SetServiceModePlugin(L"import") != SERVICE_ONLYDB) { + if (SetServiceModePlugin(L"import") != ERROR_SUCCESS) { if (IDYES == MessageBoxW(nullptr, TranslateT(MISSING_PLUG_MSG), L"Miranda NG", MB_YESNO)) Utils_OpenUrl("https://miranda-ng.org/p/Import"); goto LBL_Error; diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index dcb399e72f..cc855a2cfc 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -165,12 +165,10 @@ int PreShutdown(WPARAM, LPARAM) INT_PTR ServiceMode(WPARAM, LPARAM) { - if (!g_bServiceMode) { - g_bServiceMode = true; + g_bServiceMode = true; - IcoLibRegister(); - HookEvent(ME_DB_CONTACT_SETTINGCHANGED, DBSettingChanged); - } + IcoLibRegister(); + HookEvent(ME_DB_CONTACT_SETTINGCHANGED, DBSettingChanged); return SERVICE_ONLYDB; // load database and then call us } diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 2f31ed23c2..86706d178a 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -116,10 +116,7 @@ static int OnExit(WPARAM, LPARAM) static INT_PTR ServiceMode(WPARAM, LPARAM) { - if (!g_bServiceMode) { - g_bServiceMode = true; - return SERVICE_ONLYDB; - } + g_bServiceMode = true; ptrW wszFullName(Utils_ReplaceVarsW(L"%miranda_userdata%\\%miranda_profilename%.dat.bak")); if (!_waccess(wszFullName, 0)) { -- cgit v1.2.3