Added Null Checking for the TheaterScheduleComparer

bofirial · Jun 11, 2017 · 450eae2 · 450eae2
1 parent caa164f
commit 450eae2
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Melody49Notifier/Models/TheaterScheduleComparer.cs b/Melody49Notifier/Models/TheaterScheduleComparer.cs
@@ -20,16 +20,16 @@ public bool AreEqual(TheaterSchedule firstTheaterSchedule, TheaterSchedule secon
         {
             bool areEqual = true;
 
-            areEqual = areEqual && firstTheaterSchedule.ScheduleDescription == secondTheaterSchedule.ScheduleDescription;
-            areEqual = areEqual && firstTheaterSchedule.TheaterName == secondTheaterSchedule.TheaterName;
-            areEqual = areEqual && firstTheaterSchedule.Showings.Count == secondTheaterSchedule.Showings.Count;
+            areEqual = areEqual && firstTheaterSchedule?.ScheduleDescription == secondTheaterSchedule?.ScheduleDescription;
+            areEqual = areEqual && firstTheaterSchedule?.TheaterName == secondTheaterSchedule?.TheaterName;
+            areEqual = areEqual && firstTheaterSchedule?.Showings?.Count == secondTheaterSchedule?.Showings?.Count;
 
-            for (int i = 0; i < firstTheaterSchedule.Showings.Count; i++)
+            for (int i = 0; i < firstTheaterSchedule?.Showings?.Count; i++)
             {
-                areEqual = areEqual && firstTheaterSchedule.Showings[i].MovieDescription == secondTheaterSchedule.Showings[i].MovieDescription;
-                //areEqual = areEqual && firstTheaterSchedule.Showings[i].Screen == secondTheaterSchedule.Showings[i].Screen;
-                //areEqual = areEqual && firstTheaterSchedule.Showings[i].ShowingScheduleDescription == secondTheaterSchedule.Showings[i].ShowingScheduleDescription;
-                //areEqual = areEqual && firstTheaterSchedule.Showings[i].ActorDescription == secondTheaterSchedule.Showings[i].ActorDescription;
+                areEqual = areEqual && firstTheaterSchedule?.Showings?[i]?.MovieDescription == secondTheaterSchedule?.Showings?[i]?.MovieDescription;
+                //areEqual = areEqual && firstTheaterSchedule?.Showings?[i]?.Screen == secondTheaterSchedule?.Showings?[i]?.Screen;
+                //areEqual = areEqual && firstTheaterSchedule?.Showings?[i]?.ShowingScheduleDescription == secondTheaterSchedule?.Showings?[i]?.ShowingScheduleDescription;
+                //areEqual = areEqual && firstTheaterSchedule?.Showings?[i]?.ActorDescription == secondTheaterSchedule?.Showings?[i]?.ActorDescription;
             }
 
             return areEqual;