Prevent crash when switching themes.

4 years ago · 1eaf6cc607
1 changed files with 4 additions and 1 deletions
--- a/src/Avalonia.Base/StyledElement.cs
+++ b/src/Avalonia.Base/StyledElement.cs
@ -873,9 +873,12 @@ namespace Avalonia

                    if (applied.Source == styles[i])
                    {
-                        applied.Dispose();
                        _appliedStyles.RemoveAt(j);
+                        applied.Dispose();
                    }
+
+                    if (j > _appliedStyles.Count)
+                        j = _appliedStyles.Count;
                }
            }
        }