Make sure last applied theme is fully loaded

Arkhist · Jul 30, 2021 · 7324d7f · 7324d7f
1 parent 0b8e036
commit 7324d7f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/PathfinderAPI/BaseGameFixes/Performance/ThemeCaching.cs b/PathfinderAPI/BaseGameFixes/Performance/ThemeCaching.cs
@@ -132,7 +132,13 @@ internal static bool SwitchToLastCustomTheme(object osObject, OSTheme theme)
             if (theme == OSTheme.Custom)
             {
                 // just dont question it
-                CachedThemes.BackingListHead?.Value?.ApplyTo((OS)osObject);
+                var lastTheme = CachedThemes.BackingListHead?.Value;
+                if (lastTheme != null)
+                {
+                    if (!lastTheme.Loaded)
+                        lastTheme.Load(true);
+                    lastTheme.ApplyTo((OS)osObject);
+                }
                 return false;
             }