タイマーの初期化をMainに移す

diff --git a/KancolleSniffer/Main.cs b/KancolleSniffer/Main.cs
index 27f6282..1b59cfe 100644 (file)
--- a/KancolleSniffer/Main.cs
+++ b/KancolleSniffer/Main.cs
@@ -161,6 +161,9 @@ namespace KancolleSniffer
             {\r
                 var update = (Sniffer.Update)Sniffer.Sniff(s.Url, s.Request, JsonObject.Parse(s.Response));\r
                 _mainForm.UpdateInfo(update);\r
+                if (!Sniffer.Started)\r
+                    return;\r
+                Step.SetNowIfNeeded();\r
                 if ((update & Sniffer.Update.Timer) != 0)\r
                     _timerEnabled = true;\r
                 _errorLog.CheckBattleApi(s);\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index e4553ad..c05ea41 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -117,8 +117,6 @@ namespace KancolleSniffer
             }\r
             if (!Sniffer.Started)\r
                 return;\r
-            if (_main.Step.Now == DateTime.MinValue)\r
-                _main.Step.SetNow();\r
             if ((update & Sniffer.Update.Item) != 0)\r
                 UpdateItemInfo();\r
             if ((update & Sniffer.Update.Timer) != 0)\r

diff --git a/KancolleSniffer/Util/TimeStep.cs b/KancolleSniffer/Util/TimeStep.cs
index de5b48a..fef3844 100644 (file)
--- a/KancolleSniffer/Util/TimeStep.cs
+++ b/KancolleSniffer/Util/TimeStep.cs
@@ -22,6 +22,12 @@ namespace KancolleSniffer.Util
         public DateTime Prev { get; private set; }\r
         public DateTime Now { get; private set; }\r
 \r
+        public void SetNowIfNeeded()\r
+        {\r
+            if (Now == DateTime.MinValue)\r
+                SetNow();\r
+        }\r
+\r
         public void SetNow()\r
         {\r
             Now = DateTime.Now;\r