Changeset 130 for oup

Timestamp:

Mar 28, 2007, 3:17:24 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/current

Files:

• Helper/LevelDB.pas (modified) (2 diffs)
• _exe/OniUnPacker.exe (modified) ( previous)

oup/current/Helper/LevelDB.pas

@@ -156 +156 @@
         ShowMessage('Couldn''t delete file. Aborting');
         Exit;
-      end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
+      end else if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
       begin
-        ShowMessage('Couldn''t delete file. Aborting');
-        Exit;
+        if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
+        begin
+          ShowMessage('Couldn''t delete file. Aborting');
+          Exit;
+        end;
       end;
     end else begin
@@ -344 +347 @@
     FilesHeader[i].FileType := fileinfo.FileType;
 
-    if ((i mod 10) = 0) and (i >= 100) then
+    if ((FileID mod 10) = 0) and (FileID >= 100) then
       lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
-        (Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
-    progress.Position := i + 1;
-    lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
+        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
+    progress.Position := FileID + 1;
+    lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
     Application.ProcessMessages;
   end;