Commit: a85e8a5c7eddc24196c01c8531e54840fcc3458f - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: a85e8a5c7eddc24196c01c8531e54840fcc3458f (tree)
• Time: 2009-04-05 23:24:40
• Author: h677 <h677>
• Commiter: h677

Log Message

close #15974
タブの自動復元の際の処理を見直して、ブラウザの描画待ちでメッセージを処理
せずに単純スリープするようにした。

Change Summary

• modified: Giko.pas

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -1472,8 +1472,8 @@ var
    	item        : TThreadItem;
 begin
 	if FStartUp then begin
+    	FStartUp := false;
 		ShowWindow(Application.Handle, SW_HIDE);
-
 		//FormCreate‚Å‚â‚é‚ƉŽ‹Ý’肪”½‰f‚³‚ê‚È‚¢ê‡‚ª‚ ‚é‚Ì‚ÅFormShow‚Å‚â‚邱‚Æ‚É‚µ‚½
 		//ƒc[ƒ‹ƒo[•\Ž¦
 		GikoDM.StdToolBarVisibleAction.Checked := GikoSys.Setting.StdToolBarVisible;
@@ -1498,6 +1498,9 @@ begin
 //		ResetBandInfo( ListCoolBar, ListToolBar );
 		FIsIgnoreResize := rtNone;
 
+        //ActionList‚ÌGroupIndex‚ðŒ³‚É–ß‚·
+		SetGroupIndex(GikoDM.GikoFormActionList);
+
 		//FormCrete‚©‚çˆÚ“®B
 		if GikoSys.Setting.TabAutoLoadSave then begin
             GikoDM.TabsOpenAction.Tag := 1;
@@ -1505,26 +1508,20 @@ begin
             GikoDM.TabsOpenAction.Tag := 0;
             if (GikoSys.Setting.LastCloseTabURL <> '') then begin
                 if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
-	                PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
-	            end;
-                if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
             		while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and
     			    	(FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
-            			Application.ProcessMessages;
+                        // ƒƒbƒZ[ƒW‚ðŽó‚¯Žæ‚ç‚È‚¢‚悤‚ɃXƒŠ[ƒv‚ɕύX
+                        Sleep(1);
                     end;
 		        end;
                 item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL );
+                GikoSys.Setting.LastCloseTabURL := '';
                 if (item <> nil) and (item.IsLogFile) then begin
                     OpenThreadItem(item, item.URL);
                 end;
-                GikoSys.Setting.LastCloseTabURL := '';
+                //ShowWindow(Self.Handle, SW_SHOW);
             end;
 		end;
-
-        //ActionList‚ÌGroupIndex‚ðŒ³‚É–ß‚·
-		SetGroupIndex(GikoDM.GikoFormActionList);
-
-		FStartUp := false;
 	end;
 end;