summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-11-12 08:47:41 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-11-12 08:47:41 +0000
commit77e8bf976c6abb04539913b61a1dbf45269a1d10 (patch)
tree7be8ec250cc59608b491437b8e6f1afb23d099b3 /src
parentf62262c11a58ecfb5fc7249b6fdc21e0bc598253 (diff)
fix for DbChecker - not to load when not in use
git-svn-id: http://svn.miranda-ng.org/main/trunk@2298 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
-rw-r--r--src/modules/database/database.cpp3
-rw-r--r--src/modules/database/profilemanager.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp
index dc55487878..a1c4514092 100644
--- a/src/modules/database/database.cpp
+++ b/src/modules/database/database.cpp
@@ -28,6 +28,7 @@ extern TCHAR mirandabootini[MAX_PATH];
bool dbCreated;
TCHAR g_profileDir[MAX_PATH], g_profileName[MAX_PATH];
TCHAR* g_defaultProfile;
+void EnsureCheckerLoaded(bool);
bool fileExist(TCHAR* fname)
{
@@ -487,6 +488,8 @@ int LoadDatabaseModule(void)
if ( !getProfile(szProfile, SIZEOF(szProfile)))
return 1;
+ EnsureCheckerLoaded(false); // unload dbchecker
+
if ( arDbPlugins.getCount() == 0) {
TCHAR buf[256];
TCHAR* p = _tcsrchr(szProfile, '\\');
diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index 1b9d3bd920..e7b1898b2c 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -724,7 +724,6 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam,
break;
case WM_DESTROY:
- EnsureCheckerLoaded(false); // unload dbchecker
{
LRESULT curSel = SendDlgItemMessage(hwndDlg, IDC_SM_COMBO, CB_GETCURSEL, 0, 0);
if (curSel != CB_ERR) {