diff options
| -rw-r--r-- | src/miranda32/src/checker.cpp | 6 | ||||
| -rw-r--r-- | src/miranda32/src/miranda.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/miranda32/src/checker.cpp b/src/miranda32/src/checker.cpp index 511e228109..eb8206c95a 100644 --- a/src/miranda32/src/checker.cpp +++ b/src/miranda32/src/checker.cpp @@ -214,16 +214,14 @@ bool CheckDlls() // there's smth to delete. init UAC
if (!bInit) {
// failed? then we need UAC
- if (!PrepareEscalation()) {
-LBL_Error: MessageBox(NULL, _T("Miranda failed to delete the obsolete file. Do it manually"), arDlls[i], MB_ICONEXCLAMATION | MB_OK);
+ if (!PrepareEscalation())
return false;
- }
bInit = true;
}
if (!TryDeleteFile(arDlls[i]))
- goto LBL_Error;
+ return false;
}
return true;
diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp index d05dc557c4..e406740196 100644 --- a/src/miranda32/src/miranda.cpp +++ b/src/miranda32/src/miranda.cpp @@ -37,9 +37,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) p[1] = 0;
SetCurrentDirectory(tszPath);
- // all dlls must be moved to libs
- if (!CheckDlls())
- return 3;
+ // all old dlls must be removed
+ CheckDlls();
_tcsncat(tszPath, _T("libs"), _TRUNCATE);
DWORD cbPath = (DWORD)_tcslen(tszPath);
|