Skip to content

Commit 5aa58a0

Browse files
committed
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.
1 parent 56c9b0b commit 5aa58a0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

win/packaging/ca/CustomAction.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,11 @@ extern "C" UINT __stdcall CheckInstallDirectory(MSIHANDLE hInstall)
202202
swprintf(msg,countof(msg), L"Installation directory '%s' exists and is not empty. Choose a "
203203
"different install directory",path);
204204
WcaSetProperty(L"INSTALLDIRERROR", msg);
205+
goto LExit;
205206
}
207+
208+
WcaSetProperty(L"INSTALLDIRERROR", L"");
209+
206210
LExit:
207211
ReleaseStr(path);
208212
return WcaFinalize(er);

0 commit comments

Comments
 (0)