From: yoffy <yoffy>
Date: Thu, 21 Oct 2004 07:32:31 +0000 (+0000)
Subject: あるスレで個別あぼーんしたあとでスレを切り替えると、
X-Git-Tag: v1_64_1_820~770
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f985dd03c8767661022b34a4c9a68e3f49dc3dde;p=gikonavigoeson%2Fgikonavi.git

あるスレで個別あぼーんしたあとでスレを切り替えると、
個別あぼーんが継承されてしまっていたバグを修正。
---

diff --git a/AbonUnit.pas b/AbonUnit.pas
index fd56afc..ebcc6a7 100644
--- a/AbonUnit.pas
+++ b/AbonUnit.pas
@@ -680,34 +680,26 @@ var
 	i : Integer;
 	f : Boolean;
 begin
-	f := FileExists( SetResNumFile );
-	if f then
-		f := LoadFromSetResNumFile( SetResNumFile );
+	f := LoadFromSetResNumFile( SetResNumFile );
 	FAbonRes.FFilePath := SetResNumFile;	// Learn ‚Í‚Å•Û‘¶‚·‚é‚Ì‚Å
 	Learn( ThreadStrings );
 
-	if FileExists(SetResNumFile) = true then begin
-		if f then begin
-			for i := 0 to FAbonRes.Count - 1 do begin
-				if (FAbonRes[i].Res <= ThreadStrings.Count) and (FAbonRes[i].Res > 0) then begin
+	if f then begin
+		for i := 0 to FAbonRes.Count - 1 do begin
+			if (FAbonRes[i].Res <= ThreadStrings.Count) and (FAbonRes[i].Res > 0) then begin
 {$IFDEF NO_ABON}
-					ThreadStrings.Strings[FAbonRes[i].Res-1] :=
-						'<font color="red">‚ ‚ځ`‚ñÏ‚Ý</font>' +
-						ThreadStrings.Strings[FAbonRes[i].Res-1];
+				ThreadStrings.Strings[FAbonRes[i].Res-1] :=
+					'<font color="red">‚ ‚ځ`‚ñÏ‚Ý</font>' +
+					ThreadStrings.Strings[FAbonRes[i].Res-1];
 {$ELSE}
-					if FAbonRes[i].option = 0 then begin
-						ThreadStrings.Strings[FAbonRes[i].Res-1] := '';
-					end else begin
-						ThreadStrings.Strings[FAbonRes[i].Res-1] := '‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>';
-					end;
-{$ENDIF}
+				if FAbonRes[i].option = 0 then begin
+					ThreadStrings.Strings[FAbonRes[i].Res-1] := '';
+				end else begin
+					ThreadStrings.Strings[FAbonRes[i].Res-1] := '‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>‚ ‚ځ`‚ñ<>';
 				end;
+{$ENDIF}
 			end;
 		end;
-	end else begin
-		FIndividualFileName := SetResNumFile;
-		FAbonRes.Free;
-		FAbonRes := TIndiviAbonList.Create;
 	end;
 end;
 procedure TAbon.IndividualAbon(var ResString : String; SetResNumFile : String; ResNumber : Integer);
@@ -738,10 +730,15 @@ end;
 function TAbon.LoadFromSetResNumFile(SetResNumFile : String) : Boolean;
 begin
 
+	FIndividualFileName := SetResNumFile;
 	FAbonRes.Free;
 	FAbonRes := TIndiviAbonList.Create;
-	FAbonRes.LoadFromFile( SetResNumFile );
-	Result := true;
+	if FileExists( SetResNumFile ) then begin
+		FAbonRes.LoadFromFile( SetResNumFile );
+		Result := true;
+	end else begin
+		Result := False;
+	end;
 
 end;
 //ŒÂ•Ê‚ ‚ځ`‚ñƒtƒ@ƒCƒ‹‚ɒljÁ