diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 11:11:04 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-13 11:11:04 +0200 |
| commit | 88c35781cc9f5f3c63de98a8b6e7eb3378d4fae5 (patch) | |
| tree | 1a2c280180c19e71b87e520546b3d2473af3b1bd /win | |
| parent | 92c8d6f168f329bf7e3998a4f580781d0239b59a (diff) | |
| parent | 1e04cafcba88e1801e828a5bbab7fe9fdd7ca61c (diff) | |
| download | mariadb-git-88c35781cc9f5f3c63de98a8b6e7eb3378d4fae5.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index dbd0b36745f..c397ce234fd 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -202,7 +202,11 @@ extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE hInstall) swprintf(msg,countof(msg), L"Installation directory '%s' exists and is not empty. Choose a " "different install directory",path); WcaSetProperty(L"INSTALLDIRERROR", msg); + goto LExit; } + + WcaSetProperty(L"INSTALLDIRERROR", L""); + LExit: ReleaseStr(path); return WcaFinalize(er); |