diff --git a/applications/json_packager/deploywin/json_packager.iss b/applications/json_packager/deploywin/json_packager.iss index 333857230..d14333ce1 100644 --- a/applications/json_packager/deploywin/json_packager.iss +++ b/applications/json_packager/deploywin/json_packager.iss @@ -1,6 +1,6 @@ [Setup] AppName=External OPM JSON package Editor -AppVersion=0.1.12.0 +AppVersion=0.1.14.0 DefaultDirName={pf}\OPMUtilities DefaultGroupName=OPM UninstallDisplayIcon={app}\jsoneditor.exe diff --git a/applications/json_packager/jsonpackage.lpi b/applications/json_packager/jsonpackage.lpi index 0b3e651c8..445447ed3 100644 --- a/applications/json_packager/jsonpackage.lpi +++ b/applications/json_packager/jsonpackage.lpi @@ -25,6 +25,7 @@ + diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps index 23d9d2b7e..debf9743f 100644 --- a/applications/json_packager/jsonpackage.lps +++ b/applications/json_packager/jsonpackage.lps @@ -20,11 +20,12 @@ - + + - - + + @@ -128,123 +129,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/applications/json_packager/jsonpackage.res b/applications/json_packager/jsonpackage.res index 0e772a9d1..6d3d38a90 100644 Binary files a/applications/json_packager/jsonpackage.res and b/applications/json_packager/jsonpackage.res differ diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas index f3b4b9a82..fc64a6a19 100644 --- a/applications/json_packager/umain.pas +++ b/applications/json_packager/umain.pas @@ -36,6 +36,7 @@ unit umain; Moved inline procedure CreateUniqueINI to separate function Added Const C_DEBUGMESSAGES=TRUE/FALSE 0.1.14.0: Various changes (GetMem) + BugFix: FormCloseQuery } {$mode objfpc}{$H+} @@ -377,13 +378,16 @@ begin begin if MessageDlg(rsFileMayBeUns, mtConfirmation, [mbYes, mbNo], 0, mbNo) = mrNo then CanClose := False; + end + else + begin + CFG.WriteBool('Options', 'Virgin', False); + CFG.WriteBool('Options', 'DiableWarnings', bDisableWarnings); + CFG.UpdateFile; + Application.ProcessMessages; + CFG.Free; + slErrorList.Free; end; - CFG.WriteBool('Options', 'Virgin', False); - CFG.WriteBool('Options', 'DiableWarnings', bDisableWarnings); - CFG.UpdateFile; - Application.ProcessMessages; - CFG.Free; - slErrorList.Free; end; function TfrmMain.CreateUniqueINI(var aCount: integer):Boolean; // Recursively loop until correct INI found, or new one created