summaryrefslogtreecommitdiffstats
path: root/src/VBox/Installer/win/VirtualBox.wxs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-16 22:55:46 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-16 22:55:46 +0000
commit96647a898d62d699808316238dfb933d960413f2 (patch)
tree0138491ada40b7b3fcb80d4b219fa7922ae8f512 /src/VBox/Installer/win/VirtualBox.wxs
parentAdding debian version 7.0.14-dfsg-4. (diff)
downloadvirtualbox-96647a898d62d699808316238dfb933d960413f2.tar.xz
virtualbox-96647a898d62d699808316238dfb933d960413f2.zip
Merging upstream version 7.0.16-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/VBox/Installer/win/VirtualBox.wxs')
-rw-r--r--src/VBox/Installer/win/VirtualBox.wxs5
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 -->