X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Round.pas;h=c97722601158599d2920ef0d58f66eed0a60c5ba;hb=fd96f552157fdf507e6004a744cd88d9cac0b18e;hp=a4870d2f1c588984fa7add9280809985175ba9cc;hpb=9d9c750cc96527fcf2b9692d186cdfb1327a5e6d;p=gikonavigoeson%2Fgikonavi.git

diff --git a/Round.pas b/Round.pas
index a4870d2..c977226 100644
--- a/Round.pas
+++ b/Round.pas
@@ -87,8 +87,8 @@ begin
 		if not RoundItem.BoolData then Continue;
 		if not Giko.GikoForm.LoginAction.Checked then Exit;
 		if RoundItem.RoundType = grtBoard then begin
-			//Board := TBoard( RoundItem.Item );
-            Board := BBSsFindBoardFromURL(RoundItem.URL);
+			Board := TBoard( RoundItem.Item );
+			//Board := BBSsFindBoardFromURL(RoundItem.URL);
 			if Board <> nil then begin
 				if not Board.IsThreadDatRead then
 					GikoSys.ReadSubjectFile(Board);
@@ -100,9 +100,9 @@ begin
 		RoundItem := RoundList.Items[i, grtItem];
 		if not RoundItem.BoolData then Continue;
 		if not Giko.GikoForm.LoginAction.Checked then Exit;
-    if RoundItem.RoundType = grtItem then begin
-    	//ThreadItem := TThreadItem( RoundItem.Item );
-        ThreadItem := BBSsFindThreadFromURL(RoundItem.URL);
+	if RoundItem.RoundType = grtItem then begin
+		ThreadItem := TThreadItem( RoundItem.Item );
+		//ThreadItem := BBSsFindThreadFromURL(RoundItem.URL);
 			if ThreadItem <> nil then begin
 //				GikoForm.AddMessageList('debug2:' + IntToStr(i), nil);
 				GikoForm.DownloadContent(ThreadItem);
@@ -268,7 +268,12 @@ begin
 			Exit;
 		if TObject(RoundListView.Selected.Data) is TRoundItem then begin
 			RoundItem := TRoundItem(RoundListView.Selected.Data);
-            RoundList.Delete(RoundItem.URL,RoundItem.RoundType);
+			if( RoundItem.Item is TBoard ) then begin
+				TBoard(RoundItem.Item).Round := false;
+			end else if( RoundItem.Item is TThreadItem ) then begin
+				TThreadItem(RoundItem.Item).Round := false;
+			end;
+			//RoundList.Delete(RoundItem.URL,RoundItem.RoundType);
             {
 			if RoundItem.RoundType = grtBoard then begin
 				//Board := TBoard( RoundItem.Item );