moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-22 09:12:19 -05:00
Code Issues Releases Wiki Activity

Really fix 56*

Browse Source 
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@415 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2010-01-14 19:17:53 +00:00
parent c347db5964
commit ec333e736e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Projects/SAMufasaGUI/updateform.pas
View File

@ -38,6 +38,7 @@ type
Updater: TMMLFileDownloader; Updater: TMMLFileDownloader;
FCancelling: Boolean; FCancelling: Boolean;
FDone: Boolean;
FSimbaVersion: Integer; FSimbaVersion: Integer;
SimbaVersionThread : TSimbaVersionThread; SimbaVersionThread : TSimbaVersionThread;
private private
@ -107,7 +108,7 @@ end;
procedure TSimbaUpdateForm.CancelButtonClick(Sender: TObject); procedure TSimbaUpdateForm.CancelButtonClick(Sender: TObject);
begin begin
if FCancelled then if FCancelled or FDone then
begin begin
Self.ModalResult:=mrCancel; Self.ModalResult:=mrCancel;
Self.Hide; Self.Hide;
@ -149,6 +150,7 @@ procedure TSimbaUpdateForm.PerformUpdate;
begin begin
Updater := TMMLFileDownloader.Create; Updater := TMMLFileDownloader.Create;
FDone := False;
FCancelling := False; FCancelling := False;
FCancelled := False; FCancelled := False;
@ -182,6 +184,7 @@ begin
// more detailed info // more detailed info
writeln('EXCEPTION IN UPDATEFORM: We either hit Cancel, or something went wrong with files'); writeln('EXCEPTION IN UPDATEFORM: We either hit Cancel, or something went wrong with files');
end; end;
FDone := True;
Self.UpdateLog.Lines.Add('Done ... '); Self.UpdateLog.Lines.Add('Done ... ');
Self.UpdateLog.Lines.Add('Please restart all currently running Simba binaries.'); Self.UpdateLog.Lines.Add('Please restart all currently running Simba binaries.');
Self.OkButton.Enabled := True; // un-grey out button Self.OkButton.Enabled := True; // un-grey out button