fix(nsis): correctly remove shortcut and only remove directory if its…

… empty Close #2381
electron-userland · Feb 22, 2018 · 333a45d · 333a45d
1 parent 99c1025
commit 333a45d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/packages/electron-builder-lib/templates/nsis/uninstaller.nsh b/packages/electron-builder-lib/templates/nsis/uninstaller.nsh
@@ -38,11 +38,10 @@ Section "un.install"
     !ifndef DO_NOT_CREATE_START_MENU_SHORTCUT
       WinShell::UninstShortcut "$oldStartMenuLink"
 
+      Delete "$oldStartMenuLink"
       ReadRegStr $R1 SHELL_CONTEXT "${INSTALL_REGISTRY_KEY}" MenuDirectory
-      ${if} $R1 == ""
-        Delete "$oldStartMenuLink"
-      ${else}
-        RMDir /r "$SMPROGRAMS\$R1"
+      ${ifNot} $R1 == ""
+        RMDir "$SMPROGRAMS\$R1"
       ${endIf}
     !endif
   ${endIf}