From dbfe417a508e8d0e5bbaf4ff9d3235ee9db7204b Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Jul 2007 19:01:16 +0000
Subject: [PATCH] Bug 361402 - installer does not automatically find path to
 existing installation when going from 1.5.0.x to 2.0.0.x. r=mscott,
 a1.8.1.5=dveditz for release-drivers

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@229265 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/installer/windows/nsis/installer.nsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mozilla/mail/installer/windows/nsis/installer.nsi b/mozilla/mail/installer/windows/nsis/installer.nsi
index e4b47b7adfc..19b0de65a39 100755
--- a/mozilla/mail/installer/windows/nsis/installer.nsi
+++ b/mozilla/mail/installer/windows/nsis/installer.nsi
@@ -80,6 +80,7 @@ Var fhUninstallLog
 !insertmacro WordReplace
 !insertmacro GetSize
 !insertmacro GetParameters
+!insertmacro GetParent
 !insertmacro GetOptions
 !insertmacro GetRoot
 !insertmacro DriveSpace
@@ -107,6 +108,7 @@ VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
 !insertmacro CheckDiskSpace
 !insertmacro GetPathFromString
 !insertmacro AddHandlerValues
+!insertmacro GetSingleInstallPath
 
 !include shared.nsh
 
@@ -870,6 +872,17 @@ Function leaveComponents
 FunctionEnd
 
 Function preDirectory
+  SetShellVarContext all  ; Set SHCTX to HKLM
+  ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+  ${If} $R9 == "false"
+    SetShellVarContext current  ; Set SHCTX to HKCU
+    ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9
+  ${EndIf}
+
+  ${Unless} $R9 == "false"
+    StrCpy $INSTDIR "$R9"
+  ${EndUnless}
+
   ${If} $InstallType != 4
     ${CheckDiskSpace} $R9
     ${If} $R9 != "false"