github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 02:37:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue with hotkey, still having some issues with the translations...

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1925 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-06-20 06:13:05 +00:00
commit 7e27765314
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Greenshot/Forms/SettingsForm.cs
View file

@ -44,10 +44,13 @@ namespace Greenshot {
private static CoreConfiguration coreConfiguration = IniConfig.GetIniSection<CoreConfiguration>();
private static EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();
private ToolTip toolTip = new ToolTip();
private bool inHotkey = false;
private bool inHotkey = false;
public SettingsForm() : base() {
InitializeComponent();
// Make sure the store isn't called to early, that's why we do it manually
ManualStoreFields = true;
}
protected override void OnLoad(EventArgs e) {
@ -392,7 +395,10 @@ namespace Greenshot {
void Settings_okayClick(object sender, System.EventArgs e) {
if (CheckSettings()) {
GreenshotPlugin.Controls.HotkeyControl.UnregisterHotkeys();
SaveSettings();
StoreFields();
MainForm.RegisterHotkeys();
DialogResult = DialogResult.OK;
} else {
this.tabcontrol.SelectTab(this.tab_output);