From e173117a44162b1b3d47cd87e932178d540290dc Mon Sep 17 00:00:00 2001 From: samherrington Date: Fri, 28 Sep 2018 22:19:12 -0500 Subject: [PATCH] Fix errors when saving a blank hotkey Saving a blank hotkey showed false error even though hotkey was saved. This solution solves the issue as it stands, but I would recommend looking into cleaning up the error handling surrounding this functionality before adding any new hotkey fields. --- browser/main/modals/PreferencesModal/HotkeyTab.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index 1c40a13a..6bb916c2 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -28,6 +28,12 @@ class HotkeyTab extends React.Component { }}) } this.handleSettingError = (err) => { + if ( + this.state.config.hotkey.toggleMain == "" || + this.state.config.hotkey.toggleMode == "" + ) { + return + } this.setState({keymapAlert: { type: 'error', message: err.message != null ? err.message : i18n.__('An error occurred!')