From 253507a613a46ebec877ad213c153309b2b942b9 Mon Sep 17 00:00:00 2001
From: MaxXor <admin@maxxor.org>
Date: Tue, 2 Jun 2015 20:33:37 +0200
Subject: [PATCH] Fixed registry key access (#256)

---
 Client/Core/Extensions/RegistryKeyExtensions.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Client/Core/Extensions/RegistryKeyExtensions.cs b/Client/Core/Extensions/RegistryKeyExtensions.cs
index 1abffb7b..35209309 100644
--- a/Client/Core/Extensions/RegistryKeyExtensions.cs
+++ b/Client/Core/Extensions/RegistryKeyExtensions.cs
@@ -54,7 +54,7 @@ public static RegistryKey OpenReadonlySubKeySafe(this RegistryKey key, string na
         {
             try
             {
-                return Registry.LocalMachine.OpenSubKey(name, false);
+                return key.OpenSubKey(name, false);
             }
             catch
             {
@@ -72,7 +72,7 @@ public static RegistryKey OpenReadonlySubKeySafe(this RegistryKey key, string na
         /// unable to obtain a sub-key.</returns>
         public static RegistryKey OpenWritableSubKey(this RegistryKey key, string name)
         {
-            return Registry.LocalMachine.OpenSubKey(name, true);
+            return key.OpenSubKey(name, true);
         }
 
         /// <summary>
@@ -85,7 +85,7 @@ public static IEnumerable<string> GetFormattedKeyValues(this RegistryKey key)
         {
             if (key == null) yield break;
 
-            foreach (var k in key.GetValueNames().Where(keyVal => !keyVal.IsNameOrValueNull(key)).Where(string.IsNullOrEmpty))
+            foreach (var k in key.GetValueNames().Where(keyVal => !keyVal.IsNameOrValueNull(key)).Where(k => !string.IsNullOrEmpty(k)))
             {
                 yield return string.Format("{0}||{1}", k, key.GetValueSafe(k));
             }