終了時に、フォームが通常と異なる場合、フォームを元に戻して設定を保存する処理を

[gikonavigoeson/gikonavi.git] / Giko.pas

diff --git a/Giko.pas b/Giko.pas
index 374fdf2..799e1f9 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -1560,6 +1560,7 @@ begin
 
        Application.UnhookMainWindow(Hook);
     //\83A\83v\83\8a\83P\81[\83V\83\87\83\93\8fI\97¹\82Ì\91O\82É\83_\83E\83\93\83\8d\81[\83h\83X\83\8c\83b\83h\82É\90³\8fí\8fI\97¹\82ð\91£\82·
+    FControlThread.DownloadAbort;
     FControlThread.Terminate;
 
     //OnDestory\82¾\82Æ\8dÄ\8bN\93®\82ð\82©\82¯\82½\82Æ\82«\82È\82Ç\82É\95Û\91¶\82³\82ê\82È\82¢\82Ì\82ÅOnCloseQuery\82Å\90Ý\92è\95Û\91¶
@@ -1610,23 +1611,11 @@ begin
                        GikoSys.Setting.ResRange := FResRangeMenuSelect;
        except
        end;
-
-    //\88ê\8e\9e\93I\82É\92Ê\8fí\83X\83^\83C\83\8b\82É\96ß\82µ\82ÄCoolBar\82Ì\88Ê\92u\81A\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\82ð\95Û\91¶
-        //\81¦\92\8d\88Ó\81FOnDestroy\81AOnCloseQuery\82Å\8eg\82¤\82±\82Æ\82µ\82©\8dl\97¶\82³\82ê\82Ä\82¢\82È\82¢
-       if WindowState <> wsNormal then begin
-               WindowState := wsNormal;
-    end;
-
-    try
-       SaveCoolBarSettings;
-    except
-    end;
-
-       try
-               GikoSys.Setting.WriteWindowSettingFile;
-               GikoSys.Setting.WriteNameMailSettingFile;
-       except
-       end;
+    //\8d¡\82Ìwinodw\82Ì\83X\83^\83C\83\8b\82ÅCoolBar\82Ì\88Ê\92u\81A\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\82ð\95Û\91¶
+    SaveCoolBarSettings;
+    GikoSys.Setting.WriteWindowSettingFile;
+    // \96¼\91O\82Æ\83\81\81[\83\8b\82Ì\95Û\91¶\82È\82Ì\82Å\83G\83f\83B\83^\82ª\95Â\82¶\82½\8cã\82È\82ç\82¢\82Â\82Å\82à\82¢\82¢
+    GikoSys.Setting.WriteNameMailSettingFile;
 
        //\93ü\97Í\83A\83V\83X\83g\8b@\8d\\82Ì\90Ý\92è\82Ì\95Û\91¶
        InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);
@@ -1659,6 +1648,12 @@ begin
                RoundList.SaveRoundFile;
        except
        end;
+
+    // \83^\83X\83N\83g\83\8c\83C\82Ì\83A\83C\83R\83\93\8dí\8f\9c
+    if (FIconData.uID <> 0) then begin
+        Shell_NotifyIcon(NIM_DELETE, @FIconData);
+    end;
+
 end;
 
 procedure TGikoForm.FormDestroy(Sender: TObject);
@@ -1666,9 +1661,16 @@ var
        i                               : Integer;
        tmpBool : Boolean;
 begin
-    // \83^\83X\83N\83g\83\8c\83C\82Ì\83A\83C\83R\83\93\8dí\8f\9c
-    if (FIconData.uID <> 0) then begin
-        Shell_NotifyIcon(NIM_DELETE, @FIconData);
+    //\88ê\8e\9e\93I\82É\92Ê\8fí\83X\83^\83C\83\8b\82É\96ß\82µ\82ÄCoolBar\82Ì\88Ê\92u\81A\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\82ð\95Û\91¶
+    //\81¦\92\8d\88Ó\81FOnDestroy\82Å\8eg\82¤\82±\82Æ\82µ\82©\8dl\97¶\82³\82ê\82Ä\82¢\82È\82¢
+    //        \91¼\82Å\82â\82é\82Æ\8dÄ\95`\89æ\82ª\94­\90¶\82·\82é
+       if WindowState <> wsNormal then begin
+               WindowState := wsNormal;
+        try
+               SaveCoolBarSettings;
+                   GikoSys.Setting.WriteWindowSettingFile;
+       except
+           end;
     end;
 
        // \83}\83E\83X\83W\83F\83X\83`\83\83\81[\8aJ\95ú
@@ -1753,7 +1755,7 @@ begin
 
        try
         try
-            FControlThread.DownloadAbort;
+            //FControlThread.DownloadAbort;
             FControlThread.Terminate;
             FControlThread.WaitFor;
         except