Skip to content

Commit 50f523d

Browse files
InfernioSharlikran
authored andcommitted
Fix FNV installer using incorrect variables
Looks like this got copied from FO4, but these two variables weren't changed. No idea what impact this actually had, but my guess is that it wouldn't install correctly. Also added some remnants of the gimpshop/krita merge to the 'old files to delete' list.
1 parent 29e404c commit 50f523d

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

scripts/build/installer/install.nsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,11 @@
379379
${If} $CheckState_FalloutNV_Py == ${BST_CHECKED}
380380
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash - FalloutNV.lnk" "$Path_FalloutNV\Mopy\Wrye Bash Launcher.pyw" "" "$Path_FalloutNV\Mopy\bash\images\bash_32.ico" 0
381381
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash - FalloutNV (Debug Log).lnk" "$Path_FalloutNV\Mopy\Wrye Bash Debug.bat" "" "$Path_FalloutNV\Mopy\bash\images\bash_32.ico" 0
382-
${If} $CheckState_Fallout4_Exe == ${BST_CHECKED}
382+
${If} $CheckState_FalloutNV_Exe == ${BST_CHECKED}
383383
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash (Standalone) - FalloutNV.lnk" "$Path_FalloutNV\Mopy\Wrye Bash.exe"
384384
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash (Standalone) - FalloutNV (Debug Log).lnk" "$Path_FalloutNV\Mopy\Wrye Bash.exe" "-d"
385385
${EndIf}
386-
${ElseIf} $CheckState_Fallout4_Exe == ${BST_CHECKED}
386+
${ElseIf} $CheckState_FalloutNV_Exe == ${BST_CHECKED}
387387
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash - FalloutNV.lnk" "$Path_FalloutNV\Mopy\Wrye Bash.exe"
388388
CreateShortCut "$SMPROGRAMS\Wrye Bash\Wrye Bash - FalloutNV (Debug Log).lnk" "$Path_FalloutNV\Mopy\Wrye Bash.exe" "-d"
389389
${EndIf}

scripts/build/installer/macros.nsh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@
197197
Delete "${Path}\Mopy\bash\images\gimp16.png"
198198
Delete "${Path}\Mopy\bash\images\gimp24.png"
199199
Delete "${Path}\Mopy\bash\images\gimp32.png"
200+
Delete "${Path}\Mopy\bash\images\gimpshop16.png"
201+
Delete "${Path}\Mopy\bash\images\gimpshop24.png"
202+
Delete "${Path}\Mopy\bash\images\gimpshop32.png"
200203
Delete "${Path}\Mopy\bash\images\gmax16.png"
201204
Delete "${Path}\Mopy\bash\images\gmax24.png"
202205
Delete "${Path}\Mopy\bash\images\gmax32.png"
@@ -542,6 +545,9 @@
542545
Delete "${Path}\Mopy\bash\patcher\utilities.p*"
543546
; As of 307, the following are obsolete:
544547
Delete "${Path}\Mopy\bash\compiled\loot32.dll"
548+
Delete "${Path}\Mopy\bash\images\tools\gimpshop16.png"
549+
Delete "${Path}\Mopy\bash\images\tools\gimpshop24.png"
550+
Delete "${Path}\Mopy\bash\images\tools\gimpshop32.png"
545551
Delete "${Path}\Mopy\bash\loot.py"
546552
; And some leftovers from various releases, some of them only appeared on dev:
547553
Delete "${Path}\Mopy\INI Tweaks\Skyrim\Archery, NavMeshMove 4096 -Default [Skyrim].ini"

0 commit comments

Comments
 (0)