Rewrite our Equals implementations so they don't crash when comparing incompatible objects

2013-11-12 17:12:00 +13:00
parent 4f91c22fed
commit c373bc22e8
12 changed files with 24 additions and 58 deletions
--- a/OpenRA.FileFormats/Primitives/Pair.cs
+++ b/OpenRA.FileFormats/Primitives/Pair.cs
@@ -40,10 +40,8 @@ namespace OpenRA.FileFormats

 		public override bool Equals(object obj)
 		{
-			if (!(obj is Pair<T, U>))
-				return false;
-
-			return (Pair<T, U>)obj == this;
+			var o = obj as Pair<T, U>?;
+			return o != null && o == this;
 		}

 		public override int GetHashCode()