Remove workaround from broken 1.8.0 uninstaller

gyunaev · Oct 20, 2020 · da8d068 · da8d068
1 parent 1744bb9
commit da8d068
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/installer/installer.nsi b/installer/installer.nsi
@@ -257,30 +257,13 @@ Section "${PRODUCT_NAME}" SectionBirdTray
         DetailPrint "$(UninstallPreviousVersion)"
         !insertmacro STOP_PROCESS ${EXE_NAME} "$(StopBirdtray)" "$(StopBirdtrayError)"
 
-        # Save the config file.  TODO: Remove this after 1.8.1
-        Rename "${USER_SETTINGS_PATH}" "$TEMP\birdtray-config.json"
-
         ClearErrors
         ${if} $0 == "AllUsers"
             Call RunUninstaller
         ${else}
             !insertmacro UAC_AsUser_Call Function RunUninstaller ${UAC_SYNCREGISTERS}
         ${endif}
 
-        # Put the config file back.  TODO: Remove this block after 1.8.1
-        StrCpy $4 "0"
-        ${if} ${errors}
-            StrCpy $4 "1"
-        ${endif}
-        ${if} ${FileExists} "$TEMP\birdtray-config.json"
-            CreateDirectory "${USER_SETTINGS_PATH_ROOT}\ulduzsoft\birdtray"
-            Rename "$TEMP\birdtray-config.json" "${USER_SETTINGS_PATH}"
-        ${endif}
-        ClearErrors
-        ${if} $4 == "1"
-            SetErrors
-        ${endif}
-
         ${if} ${errors} # Stay in installer
             MessageBox MB_OKCANCEL|MB_ICONSTOP "$(UninstallPreviousVersionError)" \
                 /SD IDCANCEL IDOK Ignore