From 79a2b7f2135fed3cb1622a784a70e3c1b3495a12 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 26 Jan 2016 11:17:54 -0800
Subject: [PATCH] make sure shell var context is correct for AppData

---
 cmake/templates/NSIS.template.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index b698d6072a..42743196b5 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -639,10 +639,13 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} @PR_BUILD@ == 1
+
     ; check if we need to copy settings/content from production for this PR build
     ${NSD_GetState} $CopyFromProductionCheckbox $CopyFromProductionState
 
     ${If} $CopyFromProductionState == ${BST_CHECKED}
+      SetShellVarContext current
+
       StrCpy $0 "$APPDATA\@BUILD_ORGANIZATION@"
 
       ; we need to copy whatever is in the data folder for production build to the data folder for this build
@@ -660,6 +663,8 @@ Function HandlePostInstallOptions
       "There was a problem copying your production content and settings to $0 for this PR build.$\r$\n$\r$\nPlease copy them manually."
 
       NoError:
+
+      SetShellVarContext all
     ${EndIf}
   ${EndIf}