起動時に完了しているタイマーの通知を出す

diff --git a/KancolleSniffer/AlarmTimer.cs b/KancolleSniffer/AlarmTimer.cs
index 1871612..ef5a707 100644 (file)
--- a/KancolleSniffer/AlarmTimer.cs
+++ b/KancolleSniffer/AlarmTimer.cs
@@ -62,8 +62,7 @@ namespace KancolleSniffer
 \r
         public bool CheckAlarm(DateTime prev, DateTime now)\r
         {\r
-            return EndTime != DateTime.MinValue && prev != DateTime.MinValue &&\r
-                   prev < EndTime -_spare && EndTime - _spare <= now;\r
+            return EndTime != DateTime.MinValue && prev < EndTime - _spare && EndTime - _spare <= now;\r
         }\r
 \r
         public string ToString(DateTime now, bool endTime = false)\r
@@ -76,5 +75,4 @@ namespace KancolleSniffer
             return $"{(int)rest.TotalHours:d2}:" + rest.ToString(@"mm\:ss", CultureInfo.InvariantCulture);\r
         }\r
     }\r
-\r
 }
\ No newline at end of file

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index c2cdfa7..ba626b4 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -43,6 +43,7 @@ namespace KancolleSniffer
         private readonly ListForm _listForm;\r
         private readonly NotificationManager _notificationManager;\r
         private bool _started;\r
+        private bool _timerEnabled;\r
         private string _debugLogFile;\r
         private IEnumerator<string> _playLog;\r
 \r
@@ -413,7 +414,7 @@ namespace KancolleSniffer
 \r
         private void timerMain_Tick(object sender, EventArgs e)\r
         {\r
-            if (_started)\r
+            if (_timerEnabled)\r
             {\r
                 try\r
                 {\r
@@ -730,6 +731,7 @@ namespace KancolleSniffer
             UpdateCondTimers();\r
             UpdateAkashiTimer();\r
             _notificationManager.Flash();\r
+            _timerEnabled = true;\r
         }\r
 \r
         private void CheckAlarm(string key, AlarmTimer timer, int fleet, string subject)\r

diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs
index d3166ba..cd92247 100644 (file)
--- a/KancolleSniffer/Sniffer.cs
+++ b/KancolleSniffer/Sniffer.cs
@@ -174,7 +174,7 @@ namespace KancolleSniffer
             {\r
                 _itemInfo.InspectSlotItem(data.api_slot_item, true);\r
                 _dockInfo.InspectKDock(data.api_kdock);\r
-                return Update.Timer;\r
+                return Update.None;\r
             }\r
             if (url.EndsWith("api_get_member/basic"))\r
             {\r