From: yoffy <yoffy>
Date: Mon, 24 Nov 2003 10:50:48 +0000 (+0000)
Subject: ・キャビネットを表示したまま終了しても、
X-Git-Tag: v1_64_1_820~1565
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a39c66a92bd5cb012f61064fbf2467f66954a24;p=gikonavigoeson%2Fgikonavi.git

・キャビネットを表示したまま終了しても、
　次回起動時にキャビネットが表示されなくなってしまったので修正。
---

diff --git a/Giko.pas b/Giko.pas
index efcd66a..ae5e144 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -1157,8 +1157,6 @@ begin
 	//ŠeŽí‰ÂŽ‹ó‘ԂȂǐݒè
 
 	//ƒLƒƒƒrƒlƒbƒg
-	CabinetVisibleAction.Checked := not GikoSys.Setting.CabinetVisible;
-	CabinetVisibleAction.Execute;
 	CabinetPanel.Width := GikoSys.Setting.CabinetWidth;
 
 	//ƒƒbƒZ[ƒWƒo[
@@ -1434,18 +1432,19 @@ begin
 
 	// ‚Q‚¿‚á‚ñ‚Ë‚éƒLƒƒƒrƒlƒbƒg‚̏ó‘Ô•œŒ³(–¢ŽÀ‘•)
 	// ‚¨‚æ‚уXƒŒˆê——ƒyƒCƒ“‚̏ó‘Ô•œŒ³(–¢ŽÀ‘•AŒ»Ý‚͏‰Šú•\Ž¦—p)
-	i := GikoSys.Setting.CabinetIndex;
-	ShowBBSTree( BBSs[ 0 ] );
-	GikoSys.Setting.CabinetIndex := i;
+	//i := GikoSys.Setting.CabinetIndex;
+	//ShowBBSTree( BBSs[ 0 ] );
+	//GikoSys.Setting.CabinetIndex := i;
 
 	// ÅŒã‚É‘I‘ð‚³‚ê‚½ƒLƒƒƒrƒlƒbƒg‚Ì•œŒ³
-	if GikoSys.Setting.CabinetVisible then begin
-		Case GikoSys.Setting.CabinetIndex of
-		0: CabinetBBSAction.Execute;
-		1: CabinetHistoryAction.Execute;
-		2: CabinetFavoriteAction.Execute;
-		end;
-	end;
+ 	CabinetVisible( False );
+  if GikoSys.Setting.CabinetVisible then begin
+    Case GikoSys.Setting.CabinetIndex of
+    0: CabinetBBSAction.Execute;
+    1: CabinetHistoryAction.Execute;
+    2: CabinetFavoriteAction.Execute;
+    end;
+  end;
 
 	//ƒI[ƒgƒƒOƒCƒ“
 	if GikoSys.Setting.AutoLogin then
@@ -1880,7 +1879,7 @@ begin
 	for i := CabinetSelectPopupMenu.Items.Count - 1 downto 0 do begin
 		try
 			if CabinetSelectPopupMenu.Items[ i ] is TBBSMenuItem then begin
-				CabinetSelectPopupMenu.Items[ i ].Free;
+				//CabinetSelectPopupMenu.Items[ i ].Free;
 				CabinetSelectPopupMenu.Items.Delete( i );
 				CabinetMenu.Delete( i );
 			end;