diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-16 22:55:52 +0000 |
commit | cd47c2446f1a9dee96610f298989848f8986a8be (patch) | |
tree | 02c30d62a9164987d0aaba2f72c58a50053205d6 /src/VBox/Installer/win/VirtualBox.wxs | |
parent | Releasing progress-linux version 7.0.14-dfsg-4~progress7.99u1. (diff) | |
download | virtualbox-cd47c2446f1a9dee96610f298989848f8986a8be.tar.xz virtualbox-cd47c2446f1a9dee96610f298989848f8986a8be.zip |
Merging upstream version 7.0.16-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/VBox/Installer/win/VirtualBox.wxs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/VBox/Installer/win/VirtualBox.wxs b/src/VBox/Installer/win/VirtualBox.wxs index 1e4911cc..beccd815 100644 --- a/src/VBox/Installer/win/VirtualBox.wxs +++ b/src/VBox/Installer/win/VirtualBox.wxs @@ -127,6 +127,11 @@ Installed OR (VBOX_MSCRT_INSTALLED) </Condition> <?endif ?> + <!-- Check if the current INSTALLDIR is valid or not, or if VBox already is installed. + Thight might be handed-in via command line (MSI properties) or through a customized merge module. See @bugref{10616} --> + <Condition Message="!(loc.InvalidTargetDir)"> + Installed OR (VBox_Target_Dir_Is_Valid="1") + </Condition> <!-- Detect old innotek installation --> <!-- Force a manual uninstall of an already installed innotek VirtualBox version first --> |