From 72ec031f8aab6f8918b53293a7304c7005910757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= <jie65535@qq.com>
Date: Sat, 3 Dec 2022 11:27:51 +0800
Subject: [PATCH] Fix window location issue (#161)

---
 Source/GrasscutterTools/Forms/FormMain.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs
index e853f32..9433ecb 100644
--- a/Source/GrasscutterTools/Forms/FormMain.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.cs
@@ -46,11 +46,12 @@ namespace GrasscutterTools.Forms
 
             try
             {
+                var location = Settings.Default.MainFormLocation;
                 // 还原窗体位置
-                if (Settings.Default.MainFormLocation != default)
+                if (location != default && location.X >= 0 && location.Y >= 0)
                 {
                     StartPosition = FormStartPosition.Manual;
-                    Location = Settings.Default.MainFormLocation;
+                    Location = location;
                     Logger.I(TAG, "Restore window location: " + Location.ToString());
                 }
 
@@ -63,8 +64,6 @@ namespace GrasscutterTools.Forms
 
                 // 初始化页面
                 InitPages();
-                // 恢复自动复制选项状态
-                ChkAutoCopy.Checked = Settings.Default.AutoCopy;
             }
             catch (Exception ex)
             {
@@ -132,6 +131,9 @@ namespace GrasscutterTools.Forms
 #endif
             if (DesignMode) return;
 
+            // 恢复自动复制选项状态
+            ChkAutoCopy.Checked = Settings.Default.AutoCopy;
+
             // 加载游戏ID资源
             GameData.LoadResources();