Fix for Windows 10 v.1710, it manages package cache poorly and some s…

…ystem default packages have broken configuration.
AgentMC · Sep 30, 2018 · b9eb5cc · b9eb5cc
1 parent f19dcb3
commit b9eb5cc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/DataProviders/ImmersiveAppsProvider.cs b/DataProviders/ImmersiveAppsProvider.cs
@@ -242,12 +242,12 @@ public static bool Any
                     using (var packageKey = packageRepoKey.OpenSubKey(package))
                     {
                         // ReSharper disable once PossibleNullReferenceException
-                        pathCache[package] = new PathCacheItem
+                        var pkg = new PathCacheItem
                         {
                             DisplayName = (string)packageKey.GetValue("DisplayName"),
                             RootPath = (string)packageKey.GetValue("PackageRootFolder")
                         };
-
+                        if (pkg.RootPath != null) pathCache[package] = pkg;
                     }
                 }
             }
@@ -344,7 +344,7 @@ private static string ExtractStringFromPackageOptional(string resourceKey, strin
             {
                 foreach (var uriTemplate in uriTemplates)
                 {
-                    var pair = uriTemplate.Split(new[] { '?' }, 2);
+                    var pair = uriTemplate.Split(new[] { '?' }, 2, StringSplitOptions.RemoveEmptyEntries);
 
                     var uri = new UriBuilder(pair[1].TrimEnd('}'));
                     var uriParts = uri.Path.Split('/').ToList();