旧巡回ファイルフォーマットの読み込み処理＆新ファイルフォーマット読み込み不良対策

[gikonavigoeson/gikonavi.git] / Round.pas

diff --git a/Round.pas b/Round.pas
index 2799088..62e6cc7 100644 (file)
--- a/Round.pas
+++ b/Round.pas
@@ -69,7 +69,6 @@ begin
 //             GikoSys.MsgBox(msg, '\83G\83\89\81[', MB_OK or MB_ICONSTOP);
 //             Exit;
 //     end;
-
        if not Giko.GikoForm.LoginAction.Checked then begin
                msg := '\83\8d\83O\83C\83\93\82µ\82È\82¢\82Æ\8f\84\89ñ\82Í\8fo\97\88\82Ü\82¹\82ñ' + #13#10
                                 + '\95ª\82©\82ç\82È\82¢\90l\82Í\83M\83R\83i\83r\83X\83\8c\83b\83h\82Å\95·\82¢\82Ä\82­\82¾\82³\82¢';
@@ -89,7 +88,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 := TBoard( RoundItem.Item );
+            Board := BBSsFindBoardFromURL(RoundItem.URL);
                        if Board <> nil then begin
                                if not Board.IsThreadDatRead then
                                        GikoSys.ReadSubjectFile(Board);
@@ -102,7 +102,8 @@ begin
                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 := TThreadItem( RoundItem.Item );
+        ThreadItem := BBSsFindThreadFromURL(RoundItem.URL);
                        if ThreadItem <> nil then begin
 //                             GikoForm.AddMessageList('debug2:' + IntToStr(i), nil);
                                GikoForm.DownloadContent(ThreadItem);
@@ -268,17 +269,20 @@ begin
                        Exit;
                if TObject(RoundListView.Selected.Data) is TRoundItem then begin
                        RoundItem := TRoundItem(RoundListView.Selected.Data);
+            RoundList.Delete(RoundItem.URL,RoundItem.RoundType);
+            {
                        if RoundItem.RoundType = grtBoard then begin
-                               Board := TBoard( RoundItem.Item );
-                               RoundList.Delete(Board);
+                               //Board := TBoard( RoundItem.Item );
+                               RoundList.Delete(RoundItem.URL,RoundItem.RoundType);
                                Board.Round := False;
                                Board.RoundName := '';
                        end else begin
-                               ThreadItem := TThreadItem( RoundItem.Item );
+                               //ThreadItem := TThreadItem( RoundItem.Item );
                                RoundList.Delete(ThreadItem);
                                ThreadItem.Round := False;
                                ThreadItem.RoundName := '';
                        end;
+            }
                        GikoForm.ListView.Refresh;
                end;
                RoundListView.Selected.Delete;