diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-20 12:08:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-20 12:08:26 +0000 |
| commit | 600c5bcb32c94c1cb86fa39f05568be10003d6a9 (patch) | |
| tree | 7ce1941303836e809ee33265a75b298190b734a8 | |
| parent | 9eec36be7219420fcfa41e7d66397617c4279ff2 (diff) | |
strange, but dbchecker doesn't count fatal errors as errors...
git-svn-id: http://svn.miranda-ng.org/main/trunk@9883 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/DbChecker/src/progress.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/DbChecker/src/progress.cpp b/plugins/DbChecker/src/progress.cpp index ad12ca550c..a694ce9369 100644 --- a/plugins/DbChecker/src/progress.cpp +++ b/plugins/DbChecker/src/progress.cpp @@ -47,8 +47,11 @@ void AddToStatus(int flags, const TCHAR* fmt, ...) OutputDebugStringA("\n");
#endif
- if ((flags & STATUS_CLASSMASK) == STATUS_ERROR)
+ switch (flags & STATUS_CLASSMASK) {
+ case STATUS_ERROR:
+ case STATUS_FATAL:
errorCount++;
+ }
}
void SetProgressBar(int perThou)
@@ -124,7 +127,7 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM HFONT hoFont;
if ((int)dis->itemID == -1) break;
SendMessage(dis->hwndItem, LB_GETTEXT, dis->itemID, (LPARAM)str);
- switch(dis->itemData&STATUS_CLASSMASK) {
+ switch(dis->itemData & STATUS_CLASSMASK) {
case STATUS_MESSAGE:
SetTextColor(dis->hDC, RGB(0, 0, 0));
break;
@@ -178,9 +181,11 @@ INT_PTR CALLBACK ProgressDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM case WZN_CANCELCLICKED:
if (bShortModeDone) {
- if (bLaunchMiranda)
- CallService(MS_DB_SETDEFAULTPROFILE, (WPARAM)opts.filename, 0);
- wizardResult = 1;
+ if (!errorCount) {
+ if (bLaunchMiranda)
+ CallService(MS_DB_SETDEFAULTPROFILE, (WPARAM)opts.filename, 0);
+ wizardResult = 1;
+ }
return TRUE;
}
|