AkashiTimer.GetTimersがnullを返さないようにする

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/AkashiTimer.cs
index cae35b6..d2caee2 100644 (file)
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/AkashiTimer.cs
@@ -60,7 +60,7 @@ namespace KancolleSniffer
         private class RepairStatus\r
         {\r
             private ShipStatus[] _target;\r
-            private RepairTime[][] _times;\r
+            private RepairTime[][] _times = new RepairTime[0][];\r
             private DateTime _prev;\r
             public DateTime Start { get; set; }\r
             public int[] Deck { private get; set; }\r
@@ -75,7 +75,7 @@ namespace KancolleSniffer
                 Start = DateTime.MinValue;\r
                 Deck = null;\r
                 _target = null;\r
-                _times = null;\r
+                _times = new RepairTime[0][];\r
             }\r
 \r
             public bool DeckChanged(int[] deck)\r
@@ -104,8 +104,6 @@ namespace KancolleSniffer
 \r
             public RepairSpan[] GetTimers()\r
             {\r
-                if (_times == null)\r
-                    return null;\r
                 return (from times in _times\r
                     select times == null\r
                         ? new RepairSpan(0, TimeSpan.MinValue)\r

diff --git a/KancolleSniffer/ShipInfoLabels.cs b/KancolleSniffer/ShipInfoLabels.cs
index 69c656d..654cccf 100644 (file)
--- a/KancolleSniffer/ShipInfoLabels.cs
+++ b/KancolleSniffer/ShipInfoLabels.cs
@@ -124,7 +124,7 @@ namespace KancolleSniffer
             {\r
                 var label = _akashiTimers[i];\r
                 var labelHp = _labels[i][0];\r
-                if (timers == null || i >= timers.Length || timers[i].Span == TimeSpan.MinValue)\r
+                if (i >= timers.Length || timers[i].Span == TimeSpan.MinValue)\r
                 {\r
                     label.Visible = false;\r
                     labelHp.ForeColor = Control.DefaultForeColor;\r