From d28cf8c1591844e9482088e9aa95c11e0cbfdd0f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 20 Jun 2020 07:40:44 -0700 Subject: [PATCH] UI: Add 64bit windows checks to installer Prevents it from writing to non-existent vulkan registry locations on 32bit-only systems. --- UI/installer/mp-installer.nsi | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/UI/installer/mp-installer.nsi b/UI/installer/mp-installer.nsi index 3fbc7218f..abcc85cf0 100644 --- a/UI/installer/mp-installer.nsi +++ b/UI/installer/mp-installer.nsi @@ -352,13 +352,15 @@ Section -FinishSection # --------------------------------------- # 64bit vulkan hook registry stuff - SetRegView 64 - WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" + ${if} ${RunningX64} + SetRegView 64 + WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" - ClearErrors - DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" - ClearErrors - WriteRegDWORD HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" 0 + ClearErrors + DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" + ClearErrors + WriteRegDWORD HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" 0 + ${endif} # --------------------------------------- # 32bit vulkan hook registry stuff @@ -409,10 +411,11 @@ Section "un.obs-studio Program Files" UninstallSection1 SetRegView 32 DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json" DeleteRegValue HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan32.json" - SetRegView 64 - DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" - DeleteRegValue HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" - + ${if} ${RunningX64} + SetRegView 64 + DeleteRegValue HKCU "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" + DeleteRegValue HKLM "Software\Khronos\Vulkan\ImplicitLayers" "$APPDATA\obs-studio-hook\obs-vulkan64.json" + ${endif} SetRegView default SetShellVarContext current ClearErrors