Merge pull request #3572 from batzen/develop

Improve check for RD "equality"
MahApps · Aug 11, 2019 · 87e7bb1 · 87e7bb1
2 parents 58da447 + c0c244a
commit 87e7bb1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/MahApps.Metro/ThemeManager/ThemeManager.cs b/src/MahApps.Metro/ThemeManager/ThemeManager.cs
@@ -913,8 +913,13 @@ private static bool AreResourceDictionarySourcesEqual(ResourceDictionary first,
                 return false;
             }
 
-            if (first.Source.IsNull()
+            // If RD does not have a source, but both have keys and the first one has at least as many keys as the second,
+            // then compares their values.
+            if ((first.Source.IsNull()
                 || second.Source.IsNull())
+                && first.Keys.Count > 0
+                && second.Keys.Count > 0
+                && first.Keys.Count >= second.Keys.Count)
             {
                 try
                 {