paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-06 20:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: In TOpenDialog.DoExecute replace testing DereferenceLinks with an assertion.

Browse Source 
git-svn-id: trunk@64037 -
This commit is contained in:
juha 2020-10-17 16:19:13 +00:00
parent c2bd8a0b1e
commit 006d6e0dcf
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/commondialog.inc
View File

@ -184,7 +184,7 @@ begin
end;
Result := (FUserChoice = mrOk);
{$ifdef DebugCommonDialogEvents}
debugln(['TCommonDialog.DoExecute End']);
debugln(['TCommonDialog.DoExecute End, Result=', Result]);
{$endif}
end;

22
lcl/include/filedialog.inc
View File

@ -248,12 +248,10 @@ var i: integer;
begin
if Filename<>'' then
Filename:=GetPhysicalFilename(FileName,pfeOriginal);
if Files<>nil then begin
for i:=0 to Files.Count-1 do begin
if Files<>nil then
for i:=0 to Files.Count-1 do
if Files[i]<>'' then
Files[i]:=GetPhysicalFilename(Files[i],pfeOriginal);
end;
end;
end;
procedure TOpenDialog.DereferenceLinks;
@ -407,14 +405,16 @@ end;
function TOpenDialog.DoExecute: boolean;
begin
Result:=inherited DoExecute;
if (not (ofNoResolveLinks in Options)) then begin
if TMethod(@Self.DereferenceLinks).Code <> Pointer(@TOpenDialog.DereferenceLinks)
then begin
DereferenceLinks{%H-}; // call for compatibility
end else
ResolveLinks;
if not (ofNoResolveLinks in Options) then begin
Assert(TMethod(@Self.DereferenceLinks).Code = Pointer(@TOpenDialog.DereferenceLinks),
'TOpenDialog.DoExecute: DereferenceLinks mismatch.');
//if TMethod(@Self.DereferenceLinks).Code <> Pointer(@TOpenDialog.DereferenceLinks)
//then begin
// DereferenceLinks{%H-}; // call for compatibility
//end else
ResolveLinks;
end;
if (not (ofNoChangeDir in Options)) then begin
if not (ofNoChangeDir in Options) then begin
if (ExtractFilePath(Filename)<>'') then
InitialDir:=ExtractFilePath(Filename)
else if (Files.Count>0) and (ExtractFilePath(Files[0])<>'') then