ステータスの空欄や止まっているタイマーを空白にする

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer / MainForm.cs

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index 112c430..23f9646 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -159,7 +159,8 @@ namespace KancolleSniffer
             try\r
             {\r
                 var rx = new Regex(@"\\[uU]([0-9A-Fa-f]{4})");\r
-                return rx.Replace(s, match => ((char)int.Parse(match.Value.Substring(2), NumberStyles.HexNumber)).ToString());\r
+                return rx.Replace(s,\r
+                    match => ((char)int.Parse(match.Value.Substring(2), NumberStyles.HexNumber)).ToString());\r
             }\r
             catch (ArgumentException)\r
             {\r
@@ -682,11 +683,12 @@ namespace KancolleSniffer
                 entry.Timer.Update();\r
                 SetTimerColor(entry.label, entry.Timer);\r
                 var rest = entry.Timer.Rest;\r
-                entry.label.Text = _missionFinishTimeMode\r
-                    ? entry.Timer.EndTime == DateTime.MinValue\r
-                        ? "-------"\r
-                        : entry.Timer.EndTime.ToString(@"dd\ HH\:mm")\r
-                    : rest.ToString(@"hh\:mm\:ss");\r
+                entry.label.Text =\r
+                    entry.Timer.EndTime == DateTime.MinValue\r
+                        ? ""\r
+                        : _missionFinishTimeMode\r
+                            ? entry.Timer.EndTime.ToString(@"dd\ HH\:mm")\r
+                            : rest.ToString(@"hh\:mm\:ss");\r
                 if (!entry.Timer.NeedRing)\r
                     continue;\r
                 _noticeQueue.Enqueue("遠征が終わりました", entry.Name, _config.MissionSoundFile);\r
@@ -708,7 +710,8 @@ namespace KancolleSniffer
                 var timer = _sniffer.KDock[i];\r
                 timer.Update();\r
                 SetTimerColor(kdock[i], timer);\r
-                kdock[i].Text = timer.Rest.ToString(@"hh\:mm\:ss");\r
+\r
+                kdock[i].Text = timer.EndTime == DateTime.MinValue ? "" : timer.Rest.ToString(@"hh\:mm\:ss");\r
                 if (!timer.NeedRing)\r
                     continue;\r
                 _noticeQueue.Enqueue("建造が終わりました", $"第{i + 1:D}ドック", _config.KDockSoundFile);\r