From 18090ed664dd73943163eb8c82547bc448721567 Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Sat, 17 Dec 2016 10:40:29 +0000 Subject: [PATCH] Refs #130. Keep Microboot open when cancel is clicked. git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@192 5dc33758-31d5-4daf-9ae8-b24bf3d40d73 --- Host/MicroBoot.exe | Bin 2257920 -> 2258432 bytes Host/Source/MicroBoot/MainUnit.dfm | Bin 6773 -> 6773 bytes Host/Source/MicroBoot/MainUnit.pas | 92 ++++++++++++++++++-------- Host/Source/MicroBoot/MicroBoot.dproj | 4 +- 4 files changed, 66 insertions(+), 30 deletions(-) diff --git a/Host/MicroBoot.exe b/Host/MicroBoot.exe index a59e991db2a78360aec7ca4b8e9b7cfa1c250513..edd2c5b5bd44bd768c8ae102b54d878292f0cdc7 100644 GIT binary patch delta 7578 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 G=>G#z*v<_A delta 7311 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

0) then - //begin - // // no options will be in Param 0 - // for cnt := 1 to ParamCount do - // begin - // // look for -l option - // if System.Pos('-s', ParamStr(cnt)) > 0 then - // begin - // StayOpen := True; - // end; - // end; - //end; + if (ParamCount > 0) then + begin + // no options will be in Param 0 + for cnt := 1 to ParamCount do + begin + // look for -s option + if System.Pos('-s', ParamStr(cnt)) > 0 then + begin + StayOpen := True; + end; + end; + end; // determine what interface library to use on startup // 1) -------- From commandline parameter --------------- @@ -648,7 +678,7 @@ begin // no options will be in Param 0 for cnt := 1 to ParamCount do begin - // look for -i option + // look for -p option if System.Pos('-p', ParamStr(cnt)) > 0 then begin if OpenDialog.Execute then @@ -727,6 +757,12 @@ begin begin LogLines.SaveToFile(ExePath + 'log.txt'); end; + + // pass on cancel request to the library if a download is in progress + if MbiInterfaced = True then + begin + MbiInterface.Cancel; + end; end; //*** end of FormClose *** diff --git a/Host/Source/MicroBoot/MicroBoot.dproj b/Host/Source/MicroBoot/MicroBoot.dproj index 50f8e317..039f7f0c 100644 --- a/Host/Source/MicroBoot/MicroBoot.dproj +++ b/Host/Source/MicroBoot/MicroBoot.dproj @@ -84,8 +84,8 @@ true - 2 - CompanyName=Feaser;FileDescription=PC download tool for the OpenBLT bootloader;FileVersion=1.2.0.0;InternalName=;LegalCopyright=Feaser;LegalTrademarks=;OriginalFilename=;ProductName=MicroBoot;ProductVersion=1.2.0.0;Comments= + 3 + CompanyName=Feaser;FileDescription=PC download tool for the OpenBLT bootloader;FileVersion=1.3.0.0;InternalName=;LegalCopyright=Feaser;LegalTrademarks=;OriginalFilename=;ProductName=MicroBoot;ProductVersion=1.3.0.0;Comments= true true 1033