gridcoin-community · jamescowens · Sep 29, 2020 · Sep 22, 2020 · Sep 26, 2020 · Sep 26, 2020
diff --git a/share/pixmaps/GrcInstallBanner.jpg b/share/pixmaps/GrcInstallBanner.jpg
diff --git a/share/pixmaps/addressbook16.bmp b/share/pixmaps/addressbook16.bmp
diff --git a/share/pixmaps/addressbook16mask.bmp b/share/pixmaps/addressbook16mask.bmp
diff --git a/share/pixmaps/addressbook20.bmp b/share/pixmaps/addressbook20.bmp
diff --git a/share/pixmaps/addressbook20mask.bmp b/share/pixmaps/addressbook20mask.bmp
diff --git a/share/pixmaps/check.ico b/share/pixmaps/check.ico
diff --git a/share/pixmaps/favicon.ico b/share/pixmaps/favicon.ico
diff --git a/share/pixmaps/gradient75.png b/share/pixmaps/gradient75.png
diff --git a/share/pixmaps/gradientmiddle.png b/share/pixmaps/gradientmiddle.png
diff --git a/share/pixmaps/grc-small.png b/share/pixmaps/grc-small.png
diff --git a/share/pixmaps/grc.png b/share/pixmaps/grc.png
diff --git a/share/pixmaps/grclogo.png b/share/pixmaps/grclogo.png
diff --git a/share/pixmaps/grcsimple - Copy.png b/share/pixmaps/grcsimple - Copy.png
diff --git a/share/pixmaps/grcsm.png b/share/pixmaps/grcsm.png
diff --git a/share/pixmaps/gridcoin horizontal green.png b/share/pixmaps/gridcoin horizontal green.png
diff --git a/share/pixmaps/gridcoin horizontal.jpg b/share/pixmaps/gridcoin horizontal.jpg
diff --git a/share/pixmaps/gridcoin horizontal.png b/share/pixmaps/gridcoin horizontal.png
diff --git a/share/pixmaps/gridcoin-bc.ico b/share/pixmaps/gridcoin-bc.ico
diff --git a/share/pixmaps/gridcoin.ico b/share/pixmaps/gridcoin.ico
diff --git a/share/pixmaps/gridcoin.png b/share/pixmaps/gridcoin.png
diff --git a/share/pixmaps/gridcoin128.png b/share/pixmaps/gridcoin128.png
diff --git a/share/pixmaps/gridcoin16.ico b/share/pixmaps/gridcoin16.ico
diff --git a/share/pixmaps/gridcoin256.png b/share/pixmaps/gridcoin256.png
diff --git a/share/pixmaps/gridcoin32.ico b/share/pixmaps/gridcoin32.ico
diff --git a/share/pixmaps/gridcoin32.png b/share/pixmaps/gridcoin32.png
diff --git a/share/pixmaps/gridcoin64.ico b/share/pixmaps/gridcoin64.ico
diff --git a/share/pixmaps/nsis-header.bmp b/share/pixmaps/nsis-header.bmp
diff --git a/share/pixmaps/nsis-wizard.bmp b/share/pixmaps/nsis-wizard.bmp
diff --git a/share/pixmaps/nsis-wizard.png b/share/pixmaps/nsis-wizard.png
diff --git a/share/pixmaps/send16.bmp b/share/pixmaps/send16.bmp
diff --git a/share/pixmaps/send16mask.bmp b/share/pixmaps/send16mask.bmp
diff --git a/share/pixmaps/send16masknoshadow.bmp b/share/pixmaps/send16masknoshadow.bmp
diff --git a/share/pixmaps/send20.bmp b/share/pixmaps/send20.bmp
diff --git a/share/pixmaps/send20mask.bmp b/share/pixmaps/send20mask.bmp
diff --git a/share/pixmaps/splash.jpg b/share/pixmaps/splash.jpg
diff --git a/share/pixmaps/splash.png b/share/pixmaps/splash.png
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
@@ -17,6 +17,7 @@ SetCompressor /SOLID lzma
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
 !define MUI_HEADERIMAGE_BITMAP "${ICONDIR}\nsis-header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${ICONDIR}\nsis-wizard.bmp"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
@@ -161,13 +162,21 @@ Function .onInit
     ${If} ${RunningX64}
       ; disable registry redirection (enable access to 64-bit portion of registry)
       SetRegView 64
+      ReadRegStr $INSTDIR HKCU "${REGKEY}" "Path"
+      StrCmp $INSTDIR "" 0 rununin
+      StrCpy $INSTDIR $PROGRAMFILES64\GridcoinResearch
     ${Else}
       MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
       Abort
     ${EndIf}
+!else
+    ReadRegStr $INSTDIR HKCU "${REGKEY}" "Path"
+    StrCmp $INSTDIR "" 0 rununin
+    StrCpy $INSTDIR $PROGRAMFILES\GridcoinResearch
 !endif
-    Exec $INSTDIR\uninst.exe
-    Delete $INSTDIR\*"
+    rununin:
+      Exec $INSTDIR\uninst.exe
+      Delete $INSTDIR\*"
 FunctionEnd
 
 # Uninstaller functions