remodelingブランチから、最新版をマージ

[gikonavigoeson/gikonavi.git] / Round.pas

diff --git a/Round.pas b/Round.pas
index a4870d2..c977226 100644 (file)
--- 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 );