From 5c44fa7cec0cf2e1b3af2a8ae2b4042b808d1b0e Mon Sep 17 00:00:00 2001
From: Kazuhiro Fujieda <fujieda@users.osdn.me>
Date: Sun, 9 May 2021 17:22:19 +0900
Subject: [PATCH] =?utf8?q?=E7=B5=82=E4=BA=86=E6=99=82=E3=81=AB=E4=B8=80?=
 =?utf8?q?=E9=83=A8=E3=81=AE=E7=92=B0=E5=A2=83=E3=81=A7=E4=BE=8B=E5=A4=96?=
 =?utf8?q?=E3=81=8C=E5=87=BA=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?=
 =?utf8?q?=E3=82=8B=E3=81=AE=E3=82=92=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KancolleSniffer/MainWindow.cs          | 5 +++--
 KancolleSniffer/View/SwipeScrollify.cs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/KancolleSniffer/MainWindow.cs b/KancolleSniffer/MainWindow.cs
index 4b4fc85..7f14bfe 100644
--- a/KancolleSniffer/MainWindow.cs
+++ b/KancolleSniffer/MainWindow.cs
@@ -254,9 +254,10 @@ namespace KancolleSniffer
                     return;
                 }
             }
-            if (!SystemShutdown)
+            if (SystemShutdown)
+                _listFormGroup.WaitForCloseAll();
+            else
                 _listFormGroup.Close(); // 各自で終了処理するのでシャットダウン時は不要
-            _listFormGroup.WaitForCloseAll();
             Config.Location = (Form.WindowState == FormWindowState.Normal ? Form.Bounds : Form.RestoreBounds).Location;
             Config.ShowHpInPercent = _c.fleetPanel.ShowHpInPercent;
         }
diff --git a/KancolleSniffer/View/SwipeScrollify.cs b/KancolleSniffer/View/SwipeScrollify.cs
index 48de5c1..2bea2e7 100644
--- a/KancolleSniffer/View/SwipeScrollify.cs
+++ b/KancolleSniffer/View/SwipeScrollify.cs
@@ -165,7 +165,7 @@ namespace KancolleSniffer.View
 
             public void MouseDown(IntPtr handle, ref bool handled)
             {
-                if (!_panel.ScrollBar.Visible)
+                if (!_panel.ScrollBar.Visible || _panel.IsDisposed)
                     return;
                 if (!_mouseStart.IsEmpty)
                     return;
-- 
2.11.0