Merge branch 'pr1044' into stable

* pr1044: (GH-1043) Fix: Set-EnvironmentVariable writes error when SYSTEM
chocolatey · Mar 18, 2017 · e7ce79f · e7ce79f
2 parents 322b4eb + d24dbcb
commit e7ce79f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1 b/src/chocolatey.resources/helpers/functions/Set-EnvironmentVariable.ps1
@@ -78,7 +78,10 @@ param (
 
   [Microsoft.Win32.RegistryValueKind]$registryType = [Microsoft.Win32.RegistryValueKind]::String
   try {
-    $registryType = $win32RegistryKey.GetValueKind($Name)
+    if ($win32RegistryKey.GetValueNames() -contains $Name)
+    {
+      $registryType = $win32RegistryKey.GetValueKind($Name)
+    }
   } catch {
     # the value doesn't yet exist
     # move along, nothing to see here