diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2023-01-12 15:14:37 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2023-01-12 15:14:37 +0100 |
| commit | 5aa58a0d39e802d8dc0fda2a974713ee69961596 (patch) | |
| tree | c65d4f93d5bcb3ab81c7c38af7f2a891763f763c /win | |
| parent | 56c9b0bca0576985c31f20b46dcb060a01e81a2b (diff) | |
| download | mariadb-git-5aa58a0d39e802d8dc0fda2a974713ee69961596.tar.gz | |
MDEV-30374 Windows, MSI - do not cache error, if install directory changes.
If installation directory is not empty, MSI would shows a popup informing
user about it. The error message is stored as MSI property
INSTALLDIRERROR.
Fixed the bug that the error was not cleared, when the user changes
directory in installer UI.
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); |