From 2c196ee8a9f1c0cc419b561f55996b7b86a04f5d Mon Sep 17 00:00:00 2001 From: yury Date: Tue, 19 Jan 2021 17:13:44 +0000 Subject: [PATCH] * TRegistryIniFile: Fixed uninitialized Result in ValueExists(). Implemented SectionExists(). git-svn-id: trunk@48206 - --- packages/fcl-registry/src/registry.pp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/fcl-registry/src/registry.pp b/packages/fcl-registry/src/registry.pp index 7f11182b05..eba09c093a 100644 --- a/packages/fcl-registry/src/registry.pp +++ b/packages/fcl-registry/src/registry.pp @@ -266,6 +266,7 @@ type procedure DeleteKey(const Section, Name: String); override; procedure UpdateFile; override; function ValueExists(const Section, Ident: string): Boolean; override; + function SectionExists(const Section: string): Boolean; override; property RegIniFile: TRegIniFile read FRegIniFile; end{$ifdef XMLREG}deprecated 'Use TRegistry instead. Will be removed in 4.0'{$endif} platform; @@ -1125,13 +1126,18 @@ end; function TRegistryIniFile.ValueExists(const Section, Ident: string): Boolean; begin - with FRegInifile do - if OpenSection(Section) then - try - Result:=FRegInifile.ValueExists(Ident); - finally - CloseSection; - end; + Result:=FRegInifile.OpenSection(Section); + if Result then + try + Result:=FRegInifile.ValueExists(Ident); + finally + FRegInifile.CloseSection; + end; +end; + +function TRegistryIniFile.SectionExists(const Section: string): Boolean; +begin + Result:=FRegIniFile.KeyExists(Section); end; {$ifdef XMLREG}