*.tmpファイルの処理の不具合修正

diff --git a/GikoSystem.pas b/GikoSystem.pas
index 166a276..495d597 100644 (file)
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -536,7 +536,6 @@ begin
        //IsLogFile\97pDAT\83t\83@\83C\83\8b\83\8a\83X\83g
        //GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False, False);
        GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
-
        //\91O\89ñ\88Ù\8fí\8fI\97¹\8e\9e\97pTmp\83t\83@\83C\83\8b\83\8a\83X\83g
        //GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.tmp', TmpFileList, False, False);
        GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.tmp', TmpFileList, False);
@@ -598,9 +597,7 @@ begin
 
                                //\91O\89ñ\88Ù\8fí\8fI\97¹\8e\9e\83`\83F\83b\83N
                                if TmpFileList.Count <> 0 then begin
-                                       Index := TmpFileList.IndexOf(ChangeFileExt(ThreadItem.FileName, '.tmp'));
-                                       //if TmpFileList.Find(ChangeFileExt(ThreadItem.FileName, '.tmp'), Index) then begin
-                                       if Index <> -1 then begin
+                                       if TmpFileList.Find(ChangeFileExt(ThreadItem.FileName, '.tmp'), Index) then begin
                                                ini := TMemIniFile.Create(ExtractFilePath(Board.GetFolderIndexFileName) + TmpFileList[Index]);
                                                try
                                                        //ThreadItem.RoundDate := ini.ReadDateTime('Setting', 'RoundDate', ZERO_DATE);
@@ -764,13 +761,13 @@ procedure TGikoSys.WriteThreadDat(Board: TBoard);
 //     Values: array[Boolean] of string = ('0', '1');
 var
        i: integer;
-    Index: Integer;
-    tmpSize: Integer;
+       Index: Integer;
+       tmpSize: Integer;
        FileName: string;
        sl: TStringList;
        s: string;
        TmpFileList: TStringList;
-    ini : TMemIniFIle;
+       ini : TMemIniFIle;
 begin
        if not Board.IsThreadDatRead then
                Exit;
@@ -778,22 +775,21 @@ begin
        ForceDirectoriesEx( ExtractFilePath( FileName ) );
 
        sl := TStringList.Create;
-        TmpFileList := TStringList.Create;
+       TmpFileList := TStringList.Create;
+       TmpFileList.Sorted := true;
        try
                //GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.tmp', TmpFileList, False, true);
                GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.tmp', TmpFileList, false);
-
                sl.BeginUpdate;
                sl.Add(FOLDER_INDEX_VERSION);
                for i := 0 to Board.Count - 1 do begin
-                       if Board.Items[i].No = 0 then
-                               Board.Items[i].No := i + 1;
+                       //if Board.Items[i].No = 0 then
+                       //      Board.Items[i].No := i + 1;
+                       Board.Items[i].No := i + 1;
 
                        if TmpFileList.Count <> 0 then begin
-                               //if TmpFileList.Find(ChangeFileExt(Board.Items[i].FileName, '.tmp'), Index) then begin
-                               Index := TmpFileList.IndexOf(ChangeFileExt(Board.Items[i].FileName, '.tmp'));
-                               if Index <> -1 then begin
-                                       ini := TMemIniFile.Create(ChangeFileExt(Board.Items[Index].GetThreadFileName, '.tmp'));
+                               if TmpFileList.Find(ChangeFileExt(Board.Items[i].FileName, '.tmp'), Index) then begin
+                                       ini := TMemIniFile.Create(ExtractFilePath(Board.GetFolderIndexFileName) + TmpFileList.Strings[Index]);
                                        try
                                                tmpSize := ini.ReadInteger('Setting', 'Size', 0);
                                                if Board.Items[i].Size <  tmpSize then begin