fixed dye sorting (again)

Fixes #568 - Crash Upon Dye Selection
imchillin · Oct 5, 2021 · 99b2a37 · 99b2a37
1 parent 13542bf
commit 99b2a37
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Anamnesis/Character/Views/DyeSelector.xaml.cs b/Anamnesis/Character/Views/DyeSelector.xaml.cs
@@ -79,18 +79,21 @@ private bool OnFilter(object obj, string[]? search = null)
 
 		private int OnSort(object a, object b)
 		{
-			if (a is IDye dyeA && b is IDye dyeB)
-			{
-				if (a == DyeUtility.NoneDye)
-					return -1;
+			if (a == b)
+				return 0;
 
-				if (b == DyeUtility.NoneDye)
-					return 1;
+			if (a == DyeUtility.NoneDye && b != DyeUtility.NoneDye)
+				return -1;
 
-				if (dyeA.IsFavorite)
+			if (a != DyeUtility.NoneDye && b == DyeUtility.NoneDye)
+				return 1;
+
+			if (a is IDye dyeA && b is IDye dyeB)
+			{
+				if (dyeA.IsFavorite && !dyeB.IsFavorite)
 					return -1;
 
-				if (dyeB.IsFavorite)
+				if (!dyeA.IsFavorite && dyeB.IsFavorite)
 					return 1;
 
 				return -dyeB.Key.CompareTo(dyeA.Key);