mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Crash on editing icon file name in the file associations (fixes #2731)

Browse source 
(cherry picked from commit 32c34dc006)
This commit is contained in:
Alexander Koblov 2026-02-07 14:15:20 +03:00
commit 2ff18e0097
2 changed files with 69 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/frames/foptionsfileassoc.lfm
View file

@ -308,8 +308,8 @@ inherited frmOptionsFileAssoc: TfrmOptionsFileAssoc
Top = 10
Width = 192
Anchors = [akTop, akLeft, akRight]
OnChange = edIconFileNameChange
TabOrder = 0
OnKeyDown = edIconFileNameKeyDown
end
end
object gbExts: TGroupBox

92
src/frames/foptionsfileassoc.pas
View file

@ -114,6 +114,8 @@ type
procedure btnStartPathVarHelperClick(Sender: TObject);
procedure deStartPathAcceptDirectory(Sender: TObject; var Value: String);
procedure deStartPathChange(Sender: TObject);
procedure edIconFileNameKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure edtParamsChange(Sender: TObject);
procedure edIconFileNameChange(Sender: TObject);
procedure fneCommandAcceptFileName(Sender: TObject; var Value: String);
@ -294,8 +296,12 @@ begin
begin
sName := Exts.Items[I].Name;
// load icon for use in OnDrawItem procedure
Bitmap := PixMapManager.LoadBitmapEnhanced(Exts.Items[I].Icon, gIconsSize, True, lbFileTypes.Color);
try
// load icon for use in OnDrawItem procedure
Bitmap := PixMapManager.LoadBitmapEnhanced(Exts.Items[I].Icon, gIconsSize, True, lbFileTypes.Color);
except
Bitmap := nil;
end;
lbFileTypes.Items.AddObject(sName, Bitmap);
end;
@ -647,8 +653,8 @@ end;
{ TfrmOptionsFileAssoc.lbFileTypesSelectionChange }
procedure TfrmOptionsFileAssoc.lbFileTypesSelectionChange(Sender: TObject; User: boolean);
var
I: Integer;
ExtCommand: TExtAction;
I: integer;
bmpTemp: TBitmap = nil;
begin
if (lbFileTypes.ItemIndex >= 0) and (lbFileTypes.ItemIndex < Exts.Count) then
@ -657,6 +663,7 @@ begin
Application.ProcessMessages;
lbExts.Items.Clear;
Application.ProcessMessages;
sbtnIcon.Glyph.Clear;
ExtCommand := Exts.Items[lbFileTypes.ItemIndex];
lbExts.Items.Assign(ExtCommand.Extensions);
@ -667,12 +674,15 @@ begin
end;
if lbActions.Count > 0 then lbActions.ItemIndex := 0;
bmpTemp := PixMapManager.LoadBitmapEnhanced(ExtCommand.Icon, 32, True, sbtnIcon.Color);
try
sbtnIcon.Glyph := bmpTemp;
finally
if Assigned(bmpTemp) then
bmpTemp := PixMapManager.LoadBitmapEnhanced(ExtCommand.Icon, 32, True, sbtnIcon.Color);
try
sbtnIcon.Glyph := bmpTemp;
finally
FreeAndNil(bmpTemp);
end;
except
// Ignore
end;
FUpdatingControls := True; // Don't trigger OnChange
@ -736,6 +746,16 @@ begin
deStartPath.Directory := deStartPath.Text;
end;
procedure TfrmOptionsFileAssoc.edIconFileNameKeyDown(Sender: TObject;
var Key: Word; Shift: TShiftState);
begin
if Key = VK_RETURN then
begin
Key := 0;
edIconFileNameChange(edIconFileName);
end;
end;
{ TfrmOptionsFileAssoc.miActionsClick }
// The "tag" of the menu item calling this will give us information about the task to do.
@ -901,7 +921,10 @@ var
begin
sFileName := mbExpandFileName(edIconFileName.Text);
if ShowOpenIconDialog(Self, sFileName) then
begin
edIconFileName.Text := GetFileAssocFilenameToSave(fameIcon, sFileName);
edIconFileNameChange(edIconFileName);
end;
end;
{ TfrmOptionsFileAssoc.InsertAddSingleExtensionToLists }
@ -1259,30 +1282,53 @@ var
bmpTemp: TBitmap;
Index: integer;
begin
sbtnIcon.Glyph.Clear;
if sFileName <> EmptyStr then
begin
bmpTemp := PixMapManager.LoadBitmapEnhanced(sFileName, 32, True, sbtnIcon.Color);
if Assigned(bmpTemp) then
begin
sbtnIcon.Glyph.Assign(bmpTemp);
FreeAndNil(bmpTemp);
end
else
sbtnIcon.Glyph.Clear;
end
else
sbtnIcon.Glyph.Clear;
try
bmpTemp := PixMapManager.LoadBitmapEnhanced(sFileName, 32, True, sbtnIcon.Color);
if Assigned(bmpTemp) then
begin
sbtnIcon.Glyph.Assign(bmpTemp);
FreeAndNil(bmpTemp);
end;
except
on E: Exception do
begin
msgError(E.Message);
end;
end;
end;
Index := lbFileTypes.ItemIndex;
if (Index >= 0) and (Index < Exts.Count) then
begin
FreeIcon(Index);
// save icon for use in OnDrawItem procedure
if sFileName <> EmptyStr then lbFileTypes.Items.Objects[Index] := PixMapManager.LoadBitmapEnhanced(sFileName, gIconsSize, True, Color);
lbFileTypes.Repaint;
Exts.Items[Index].IconIndex:= -1;
Exts.Items[Index].Icon:= EmptyStr;
Exts.Items[Index].Icon := sFileName;
Exts.Items[Index].IconIndex := -1;
// save icon for use in OnDrawItem procedure
if not sbtnIcon.Glyph.Empty then
try
if (gIconsSize <> 32) then
bmpTemp:= PixMapManager.LoadBitmapEnhanced(sFileName, gIconsSize, True, Color)
else begin
bmpTemp:= TBitmap.Create;
bmpTemp.Assign(sbtnIcon.Glyph);
end;
Exts.Items[Index].Icon := sFileName;
lbFileTypes.Items.Objects[Index] := bmpTemp;
except
on E: Exception do
begin
msgError(E.Message);
end;
end;
lbFileTypes.Repaint;
end;
end;