From 06e62ae68284cbb5d94be700c40be7a031781554 Mon Sep 17 00:00:00 2001 From: Konstantin Isakov Date: Fri, 19 Mar 2010 17:17:45 +0300 Subject: [PATCH] Only install main window global hotkey if it is actually enabled. --- src/mainwindow.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 41ca20a3..ad84bea7 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -1320,10 +1320,11 @@ void MainWindow::installHotKeys() return; } - hotkeyWrapper->setGlobalKey( cfg.preferences.mainWindowHotkey.key1, - cfg.preferences.mainWindowHotkey.key2, - cfg.preferences.mainWindowHotkey.modifiers, - 0 ); + if ( cfg.preferences.enableMainWindowHotkey ) + hotkeyWrapper->setGlobalKey( cfg.preferences.mainWindowHotkey.key1, + cfg.preferences.mainWindowHotkey.key2, + cfg.preferences.mainWindowHotkey.modifiers, + 0 ); if ( cfg.preferences.enableClipboardHotkey && scanPopup.get() ) {