diff options
| -rw-r--r-- | plugins/CrashDumper/src/dumper.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/database.cpp | 5 | ||||
| -rw-r--r-- | src/mir_app/src/profilemanager.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/profilemanager.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index 1c81ee98b8..d77853da59 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -189,7 +189,7 @@ static void GetPluginsString(CMStringW &buffer, unsigned &flags) loaded = true;
}
- if (hModule == nullptr && wcsicmp(FindFileData.cFileName, L"dbchecker.dll")) {
+ if (hModule == nullptr) {
if ((flags & VI_FLAG_PRNVAR) && IsPluginEnabled(FindFileData.cFileName)) {
wchar_t timebuf[30] = L"";
GetLastWriteTime(&FindFileData.ftLastWriteTime, timebuf, 30);
diff --git a/src/mir_app/src/database.cpp b/src/mir_app/src/database.cpp index 939599aafc..1e02f0d009 100644 --- a/src/mir_app/src/database.cpp +++ b/src/mir_app/src/database.cpp @@ -32,7 +32,6 @@ DATABASELINK *currDblink = nullptr; bool g_bDbCreated;
wchar_t g_profileDir[MAX_PATH], g_profileName[MAX_PATH], g_shortProfileName[MAX_PATH];
wchar_t* g_defaultProfile;
-void EnsureCheckerLoaded(bool);
bool fileExist(const wchar_t *fname)
{
@@ -528,7 +527,9 @@ int LoadDatabaseModule(void) }
} while (retry);
- EnsureCheckerLoaded(false); // unload dbchecker
+ // if there is a service mode plugin to start, disable dbchecker
+ if (mir_wstrlen(CmdLine_GetOption(L"svc")) > 0)
+ EnsureCheckerLoaded(false); // unload dbchecker
if (rc == ERROR_SUCCESS) {
InitIni();
diff --git a/src/mir_app/src/profilemanager.cpp b/src/mir_app/src/profilemanager.cpp index 9da0261e13..48d7d71451 100644 --- a/src/mir_app/src/profilemanager.cpp +++ b/src/mir_app/src/profilemanager.cpp @@ -30,8 +30,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma warning(disable : 4512) -void EnsureCheckerLoaded(bool); - #define WM_INPUTCHANGED (WM_USER + 0x3000) #define WM_FOCUSTEXTBOX (WM_USER + 0x3001) diff --git a/src/mir_app/src/profilemanager.h b/src/mir_app/src/profilemanager.h index da5001b4f5..41b1df15de 100644 --- a/src/mir_app/src/profilemanager.h +++ b/src/mir_app/src/profilemanager.h @@ -43,5 +43,7 @@ int isValidProfileName(const wchar_t *name); bool fileExist(const wchar_t *fname);
bool shouldAutoCreate(wchar_t *szProfile);
+void EnsureCheckerLoaded(bool);
+
extern wchar_t g_profileDir[MAX_PATH], g_profileName[MAX_PATH], g_shortProfileName[MAX_PATH];
extern bool g_bDbCreated;
|