X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Giko.pas;fp=Giko.pas;h=799e1f9909d0191ba5f4ac460dd7314bfce73f3d;hb=5dbb035408e7067010fe68df28bc457210f838a1;hp=374fdf2a9898a0a69b8d4d818ebef1718d9fc7a8;hpb=4905e79e46f374336c3030b36635c687f4b177c8;p=gikonavigoeson%2Fgikonavi.git

diff --git a/Giko.pas b/Giko.pas
index 374fdf2..799e1f9 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -1560,6 +1560,7 @@ begin
 
 	Application.UnhookMainWindow(Hook);
     //AvP[VI¹ÌOÉ_E[hXbhÉ³íI¹ð£·
+    FControlThread.DownloadAbort;
     FControlThread.Terminate;
 
     //OnDestory¾ÆÄN®ð©¯½Æ«ÈÇÉÛ¶³êÈ¢ÌÅOnCloseQueryÅÝèÛ¶
@@ -1610,23 +1611,11 @@ begin
 			GikoSys.Setting.ResRange := FResRangeMenuSelect;
 	except
 	end;
-
-    //êIÉÊíX^CÉßµÄCoolBarÌÊuAEBhEÌÊuðÛ¶
-        //¦ÓFOnDestroyAOnCloseQueryÅg¤±Æµ©l¶³êÄ¢È¢
-  	if WindowState <> wsNormal then begin
-   		WindowState := wsNormal;
-    end;
-
-    try
-    	SaveCoolBarSettings;
-    except
-    end;
-
-	try
-		GikoSys.Setting.WriteWindowSettingFile;
-		GikoSys.Setting.WriteNameMailSettingFile;
-	except
-	end;
+    //¡ÌwinodwÌX^CÅCoolBarÌÊuAEBhEÌÊuðÛ¶
+    SaveCoolBarSettings;
+    GikoSys.Setting.WriteWindowSettingFile;
+    // ¼OÆ[ÌÛ¶ÈÌÅGfB^ªÂ¶½ãÈç¢ÂÅà¢¢
+    GikoSys.Setting.WriteNameMailSettingFile;
 
 	//üÍAVXg@\ÌÝèÌÛ¶
 	InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);
@@ -1659,6 +1648,12 @@ begin
 		RoundList.SaveRoundFile;
 	except
 	end;
+
+    // ^XNgCÌACRí
+    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
-    // ^XNgCÌACRí
-    if (FIconData.uID <> 0) then begin
-        Shell_NotifyIcon(NIM_DELETE, @FIconData);
+    //êIÉÊíX^CÉßµÄCoolBarÌÊuAEBhEÌÊuðÛ¶
+    //¦ÓFOnDestroyÅg¤±Æµ©l¶³êÄ¢È¢
+    //        ¼ÅâéÆÄ`æª­¶·é
+  	if WindowState <> wsNormal then begin
+   		WindowState := wsNormal;
+        try
+        	SaveCoolBarSettings;
+		    GikoSys.Setting.WriteWindowSettingFile;
+    	except
+	    end;
     end;
 
 	// }EXWFX`[Jú
@@ -1753,7 +1755,7 @@ begin
 
 	try
         try
-            FControlThread.DownloadAbort;
+            //FControlThread.DownloadAbort;
             FControlThread.Terminate;
             FControlThread.WaitFor;
         except