From: Stefan Weil Date: Sat, 28 Sep 2013 08:34:30 +0000 (+0200) Subject: nsis: Improved support for parallel installation of 32 and 64 bit code X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=40b9cc5e40ca69c15a2243852fa20fd1a35a0ea6;p=qemu.git nsis: Improved support for parallel installation of 32 and 64 bit code 32 and 64 bit variants of QEMU already had different default installation directories, but used a common registry key for saving the choosen directory. This is confusing for users who want to install both variants, so fix it by using different registry keys. Signed-off-by: Stefan Weil --- diff --git a/qemu.nsi b/qemu.nsi index 0dc1f52693..cc5fafd579 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -60,7 +60,11 @@ InstallDir $PROGRAMFILES\qemu ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) -InstallDirRegKey HKLM "Software\qemu" "Install_Dir" +!ifdef W64 +InstallDirRegKey HKLM "Software\qemu64" "Install_Dir" +!else +InstallDirRegKey HKLM "Software\qemu32" "Install_Dir" +!endif ; Request administrator privileges for Windows Vista. RequestExecutionLevel admin