paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-08 11:58:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

EditorMacroScript: deal with broken xml file

Browse Source 
git-svn-id: trunk@47133 -
This commit is contained in:
martin 2014-12-08 01:09:26 +00:00
parent b58ff06478
commit 91bf3f088a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/macroscript/emscriptmacro.pas
View File

@ -82,7 +82,7 @@ type
FSelfTestError: String;
FSelfTestFailed: Integer; // stores EMSVersion that failed
protected
function GetXmlConf: TRttiXMLConfig;
function GetXmlConf(CleanOnError: Boolean = False): TRttiXMLConfig;
public
constructor Create;
procedure Init;
@ -147,15 +147,24 @@ end;
{ TEMSConfig }
function TEMSConfig.GetXmlConf: TRttiXMLConfig;
function TEMSConfig.GetXmlConf(CleanOnError: Boolean): TRttiXMLConfig;
var
fn: String;
begin
fn := GetConfFileName;
if (not FileExistsUTF8(fn)) then
if (not FileExistsUTF8(fn)) then begin
Result := TRttiXMLConfig.CreateClean(fn)
else
Result := TRttiXMLConfig.Create(fn);
end
else begin
if CleanOnError then
try
Result := TRttiXMLConfig.Create(fn);
except
Result := TRttiXMLConfig.CreateClean(fn)
end
else
Result := TRttiXMLConfig.Create(fn);
end;
end;
constructor TEMSConfig.Create;
@ -189,7 +198,7 @@ var
def: TEMSConfig;
cfg: TRttiXMLConfig;
begin
cfg := GetXmlConf;
cfg := GetXmlConf(True);
def := TEMSConfig.Create;
try
cfg.WriteObject('EMS/Settings/', Self, def);