From e62f67a847e65b36425929f4caf01e31a9a7ad9d Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 5 Feb 2019 10:31:59 -0800
Subject: [PATCH] Don't remove unselected component in Win installer

---
 cmake/templates/NSIS.template.in | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 9ce11ca032..cc7a6929a2 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -300,6 +300,8 @@ Var substringResult
   SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
   ;Checking lowest bit:
   IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
+  !insertmacro LoadVar ${SecName}_was_installed
+  IntOp $AR_SecFlags $AR_SecFlags | $R0
   IntCmp $AR_SecFlags 1 "leave_${SecName}"
     ;Section is not selected:
 
@@ -478,18 +480,6 @@ Var GAClientID
 ;--------------------------------
 ; Installation types
 
-Section "-Previous Install Cleanup"
-  ; Remove the resources folder so we don't end up including removed QML files
-  RMDir /r "$INSTDIR\resources"
-
-  ; delete old assignment-client and domain-server so they're no longer present
-  ; in client only installs.
-  Delete "$INSTDIR\@DS_EXEC_NAME@" 
-  Delete "$INSTDIR\@AC_EXEC_NAME@" 
-  
-  ; delete interface so it's not there for server-only installs
-  Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" 
-SectionEnd
 
 @CPACK_NSIS_INSTALLATION_TYPES@