泊地修理中でない艦隊で明石タイマーを表示する

diff --git a/KancolleSniffer/AkashiTimer.cs b/KancolleSniffer/AkashiTimer.cs
index 53d2dcd..4dd0eb0 100644 (file)
--- a/KancolleSniffer/AkashiTimer.cs
+++ b/KancolleSniffer/AkashiTimer.cs
@@ -234,7 +234,7 @@ namespace KancolleSniffer
         {\r
             get\r
             {\r
-                if (_start == DateTime.MinValue || _repairStatuses.Any(rs => rs.State != State.Stop))\r
+                if (_start == DateTime.MinValue)\r
                     return TimeSpan.MinValue;\r
                 var r = _start + TimeSpan.FromMinutes(20) - DateTime.Now;\r
                 return r >= TimeSpan.Zero ? r : TimeSpan.Zero;\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 490e3f7..62d4708 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -736,7 +736,9 @@ namespace KancolleSniffer
         private void UpdateAkashiTimer()\r
         {\r
             var span = _sniffer.AkashiPresetDeckTimer;\r
-            labelPresetDeckTimer.Text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");\r
+            var timer = _sniffer.GetAkashiTimers(_currentFleet);\r
+            var reparing = timer.Any(t => t.Span != TimeSpan.MinValue);\r
+            labelPresetDeckTimer.Text = span == TimeSpan.MinValue || reparing ? "" : span.ToString(@"mm\:ss");\r
             _shipLabels.SetAkashiTimer(_sniffer.GetShipStatuses(_currentFleet),\r
                 _sniffer.GetAkashiTimers(_currentFleet));\r
             NotifyAkashiTimer();\r