mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-28 10:02:14 +00:00
FIX: Error on open incorrect image in Viewer
This commit is contained in:
parent
82bc755ea8
commit
7156cd3d2e
1 changed files with 11 additions and 4 deletions
15
fviewer.pas
15
fviewer.pas
|
|
@ -588,20 +588,27 @@ var
|
|||
fsFileStream: TFileStreamEx;
|
||||
begin
|
||||
// DebugLn('TfrmViewer.Load graphics');
|
||||
bImage:= True;
|
||||
sExt:= ExtractFileExt(sFilename);
|
||||
System.Delete(sExt, 1, 1); // delete a dot
|
||||
fsFileStream:= TFileStreamEx.Create(sFileName, fmOpenRead);
|
||||
try
|
||||
Image.Picture.LoadFromStreamWithFileExt(fsFileStream, sExt);
|
||||
fsFileStream:= TFileStreamEx.Create(sFileName, fmOpenRead);
|
||||
try
|
||||
Image.Picture.LoadFromStreamWithFileExt(fsFileStream, sExt);
|
||||
except
|
||||
FreeAndNil(fsFileStream);
|
||||
ReMmapIfNeed; // open as text
|
||||
Exit;
|
||||
end;
|
||||
finally
|
||||
fsFileStream.Free;
|
||||
if Assigned(fsFileStream) then
|
||||
fsFileStream.Free;
|
||||
end;
|
||||
miStretch.Checked:= not miStretch.Checked;
|
||||
miStretchClick(nil);
|
||||
nbPages.ActivePageComponent:= pgImage;
|
||||
miImage.Visible:= True;
|
||||
miEdit.Visible:= False;
|
||||
bImage:= True;
|
||||
end;
|
||||
|
||||
procedure TfrmViewer.DoSearch;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue