mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [0002373] If DC runs slowly, and 2nd instances runs-- crash because of "cannot read pixmap file"

Browse source
This commit is contained in:
Alexander Koblov 2019-12-07 17:29:54 +00:00
commit 0232f55f4e
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/platform/upixmapmanager.pas
View file

@ -783,13 +783,15 @@ begin
if (mbFileAge(gpCfgDir + pixmaps_cache) = mTime) and
(mbFileAccess(gpCfgDir + pixmaps_cache, fmOpenRead)) and
(mbFileSize(gpCfgDir + pixmaps_cache) > SizeOf(DWord) * 2) then
begin
cache := TFileStreamEx.Create(gpCfgDir + pixmaps_cache, fmOpenRead);
try
cache := TFileStreamEx.Create(gpCfgDir + pixmaps_cache, fmOpenRead or fmShareDenyWrite);
if (cache.ReadDWord <> NtoBE(cache_signature)) or
(cache.ReadDWord <> cache_version) then
begin
FreeAndNil(cache);
end;
except
cache:= nil;
end;
if Assigned(cache) then
@ -874,7 +876,7 @@ begin
// save to cache
try
cache := TFileStreamEx.Create(gpCfgDir + pixmaps_cache, fmCreate);
cache := TFileStreamEx.Create(gpCfgDir + pixmaps_cache, fmCreate or fmShareDenyWrite);
try
cache.WriteDWord(NtoBE(cache_signature));
cache.WriteDWord(cache_version);
@ -904,12 +906,9 @@ begin
end;
finally
if Assigned(globs) then
FreeAndNil(globs);
if Assigned(generic_icons) then
FreeAndNil(generic_icons);
if Assigned(cache) then
FreeAndNil(cache);
FreeAndNil(globs);
FreeAndNil(generic_icons);
FreeAndNil(cache);
end;
end;