opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #744: Suspend action list on mainform while preferences dialog is open, so changes on the Shortcuts tab do not trigger some action, probably even with a crash

Browse Source
This commit is contained in:
Ansgar Becker
2020-12-22 08:46:18 +01:00
parent 172c9aeec8
commit e180f6ce6f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/options.pas
View File

@ -13,7 +13,7 @@ uses
StdCtrls, ComCtrls, ExtCtrls, SynEditHighlighter, SynHighlighterSQL, StdCtrls, ComCtrls, ExtCtrls, SynEditHighlighter, SynHighlighterSQL,
SynEdit, SynMemo, VirtualTrees, SynEditKeyCmds, ActnList, StdActns, Menus, SynEdit, SynMemo, VirtualTrees, SynEditKeyCmds, ActnList, StdActns, Menus,
dbstructures, gnugettext, Vcl.Themes, Vcl.Styles, SynRegExpr, Generics.Collections, dbstructures, gnugettext, Vcl.Themes, Vcl.Styles, SynRegExpr, Generics.Collections,
Vcl.ImageCollection, extra_controls, theme_preview, Vcl.Buttons; Vcl.ImageCollection, extra_controls, theme_preview, Vcl.Buttons, System.Actions;
type type
TShortcutItemData = record TShortcutItemData = record
@ -465,6 +465,7 @@ begin
mtInformation, mtInformation,
[mbOk]); [mbOk]);
end; end;
MainForm.ActionList1.State := asNormal;
end; end;
@ -739,6 +740,9 @@ begin
chkAskFileSave.Checked := AppSettings.ReadBool(asPromptSaveFileOnTabClose); chkAskFileSave.Checked := AppSettings.ReadBool(asPromptSaveFileOnTabClose);
chkRestoreTabs.Checked := AppSettings.ReadBool(asRestoreTabs); chkRestoreTabs.Checked := AppSettings.ReadBool(asRestoreTabs);
// Disable global shortcuts
MainForm.ActionList1.State := asSuspended;
FRestartOptionTouched := False; FRestartOptionTouched := False;
btnApply.Enabled := False; btnApply.Enabled := False;
screen.Cursor := crdefault; screen.Cursor := crdefault;