Skip to content

Commit

Permalink
Merge pull request #2551 from SebDieBln/RestoreEmtpyShortcuts
Browse files Browse the repository at this point in the history
Do not reapply default value to shortcuts that are set to "none" (fixes #7905)
  • Loading branch information
nyalldawson committed Dec 13, 2015
2 parents 7f674a4 + 111393e commit aedcf3a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/app/qgsshortcutsmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ bool QgsShortcutsManager::registerAction( QAction* action, const QString& defaul
QSettings settings;
QString shortcut = settings.value( "/shortcuts/" + actionText, defaultShortcut ).toString();

if ( !shortcut.isEmpty() )
action->setShortcut( shortcut );
action->setShortcut( shortcut );

return true;
}
Expand Down

0 comments on commit aedcf3a

Please sign in to comment.