終了時に一部の環境で例外が出ることがあるのを直す

diff --git a/KancolleSniffer/MainWindow.cs b/KancolleSniffer/MainWindow.cs
index 4b4fc85..7f14bfe 100644 (file)
--- a/KancolleSniffer/MainWindow.cs
+++ b/KancolleSniffer/MainWindow.cs
@@ -254,9 +254,10 @@ namespace KancolleSniffer
                     return;\r
                 }\r
             }\r
-            if (!SystemShutdown)\r
+            if (SystemShutdown)\r
+                _listFormGroup.WaitForCloseAll();\r
+            else\r
                 _listFormGroup.Close(); // 各自で終了処理するのでシャットダウン時は不要\r
-            _listFormGroup.WaitForCloseAll();\r
             Config.Location = (Form.WindowState == FormWindowState.Normal ? Form.Bounds : Form.RestoreBounds).Location;\r
             Config.ShowHpInPercent = _c.fleetPanel.ShowHpInPercent;\r
         }\r

diff --git a/KancolleSniffer/View/SwipeScrollify.cs b/KancolleSniffer/View/SwipeScrollify.cs
index 48de5c1..2bea2e7 100644 (file)
--- a/KancolleSniffer/View/SwipeScrollify.cs
+++ b/KancolleSniffer/View/SwipeScrollify.cs
@@ -165,7 +165,7 @@ namespace KancolleSniffer.View
 \r
             public void MouseDown(IntPtr handle, ref bool handled)\r
             {\r
-                if (!_panel.ScrollBar.Visible)\r
+                if (!_panel.ScrollBar.Visible || _panel.IsDisposed)\r
                     return;\r
                 if (!_mouseStart.IsEmpty)\r
                     return;\r