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: With the r6597 to r6600, when exiting the configuration frame for the folder tabs, it was saving incorrectly the option related with what to do on double click on a tab. So when it was time to restore it, it was not restoring it correctly and crash while doing signature. This has been fixed by validating it restore correctly AND also signature routine has been modified so of -1 is the index of a combo box it won't crash anymore.

Browse source
This commit is contained in:
Denis Bisson 2016-02-15 10:47:16 +00:00
commit bccfd51260
2 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/frames/foptionstabs.pas
View file

@ -27,8 +27,7 @@ unit fOptionsTabs;
interface
uses
Classes, SysUtils, StdCtrls, ComCtrls, ExtCtrls, fOptionsFrame;
Classes, SysUtils, StdCtrls, ComCtrls, ExtCtrls, fOptionsFrame, uDebug;
type
{ TfrmOptionsTabs }
@ -63,8 +62,8 @@ type
procedure Load; override;
function Save: TOptionsEditorSaveFlags; override;
public
class function GetIconIndex: Integer; override;
class function GetTitle: String; override;
class function GetIconIndex: integer; override;
class function GetTitle: string; override;
function CanWeClose(var WillNeedUpdateWindowView: boolean): boolean; override;
end;
@ -79,17 +78,20 @@ uses
procedure TfrmOptionsTabs.Init;
begin
DCdebug('Init in');
ParseLineToList(rsOptTabsPosition, cmbTabsPosition.Items);
ParseLineToList(rsTabsActionOnDoubleClickChoices, cbTabsActionOnDoubleClick.Items);
FPageControl := TPageControl.Create(Self);
DCdebug('Init out');
DCdebug('Count: ' + IntToStr(cbTabsActionOnDoubleClick.Items.Count));
end;
class function TfrmOptionsTabs.GetIconIndex: Integer;
class function TfrmOptionsTabs.GetIconIndex: integer;
begin
Result := 9;
end;
class function TfrmOptionsTabs.GetTitle: String;
class function TfrmOptionsTabs.GetTitle: string;
begin
Result := rsOptionsEditorFolderTabs;
end;
@ -97,7 +99,7 @@ end;
procedure TfrmOptionsTabs.Load;
begin
{$IFDEF MSWINDOWS}
cbTabsShowDriveLetter.Visible:=True;
cbTabsShowDriveLetter.Visible := True;
{$ENDIF}
cbTabsAlwaysVisible.Checked := (tb_always_visible in gDirTabOptions) and gDirectoryTabs;
cbTabsLimitOption.Checked := tb_text_length_limit in gDirTabOptions;
@ -111,23 +113,25 @@ begin
cbKeepRenamedNameBackToNormal.Checked := tb_keep_renamed_when_back_normal in gDirTabOptions;
cbTabsActivateOnClick.Checked := tb_activate_panel_on_click in gDirTabOptions;
cbTabsShowDriveLetter.Checked := tb_show_drive_letter in gDirTabOptions;
cbTabsActionOnDoubleClick.ItemIndex := Integer(gDirTabActionOnDoubleClick);
cbTabsActionOnDoubleClick.ItemIndex := integer(gDirTabActionOnDoubleClick);
if cbTabsActionOnDoubleClick.ItemIndex = -1 then cbTabsActionOnDoubleClick.ItemIndex := 1; // Because with r6597 to r6599 we saved incorrect value for "gDirTabActionOnDoubleClick"...
cbTabsActionOnDoubleClick.Refresh;
cbTabsMultiLines.Visible := (nbcMultiline in FPageControl.GetCapabilities);
if cbTabsMultiLines.Visible then
cbTabsMultiLines.Checked:= tb_multiple_lines in gDirTabOptions;
cbTabsMultiLines.Checked := tb_multiple_lines in gDirTabOptions;
cbTabsShowCloseButton.Visible:= (nbcShowCloseButtons in FPageControl.GetCapabilities);
cbTabsShowCloseButton.Visible := (nbcShowCloseButtons in FPageControl.GetCapabilities);
if cbTabsShowCloseButton.Visible then
cbTabsShowCloseButton.Checked:= tb_show_close_button in gDirTabOptions;
cbTabsShowCloseButton.Checked := tb_show_close_button in gDirTabOptions;
edtTabsLimitLength.Text:= IntToStr(gDirTabLimit);
edtTabsLimitLength.Text := IntToStr(gDirTabLimit);
case gDirTabPosition of
tbpos_top: cmbTabsPosition.ItemIndex := 0;
tbpos_top: cmbTabsPosition.ItemIndex := 0;
tbpos_bottom: cmbTabsPosition.ItemIndex := 1;
else cmbTabsPosition.ItemIndex := 0;
else
cmbTabsPosition.ItemIndex := 0;
end;
Application.ProcessMessages;

7
src/frames/ucomponentssignature.pas
View file

@ -77,8 +77,11 @@ begin
'TComboBox':
begin
SampleValue := TComboBox(aComponent).ItemIndex;
Result := crc32(Result, @SampleValue, sizeof(SampleValue));
if TComboBox(aComponent).ItemIndex <> -1 then
begin
SampleValue := TComboBox(aComponent).ItemIndex;
Result := crc32(Result, @SampleValue, sizeof(SampleValue));
end;
if length(TComboBox(aComponent).Text) > 0 then
Result := crc32(Result, @TComboBox(aComponent).Text[1], length(TComboBox(aComponent).Text));