Don't crash when some shortcuts can't be loaded

Fix #14528 (cherry picked from commit 76296c8)
qgis · Mar 23, 2016 · addcf3c · addcf3c
1 parent 0c65f7f
commit addcf3c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/app/qgsconfigureshortcutsdialog.cpp b/src/app/qgsconfigureshortcutsdialog.cpp
@@ -224,7 +224,8 @@ void QgsConfigureShortcutsDialog::loadShortcuts()
     actionName = child.attribute( "name" );
     actionShortcut = child.attribute( "shortcut" );
     action = QgsShortcutsManager::instance()->actionByName( actionName );
-    QgsShortcutsManager::instance()->setActionShortcut( action, actionShortcut );
+    if ( action )
+      QgsShortcutsManager::instance()->setActionShortcut( action, actionShortcut );
     child = child.nextSiblingElement();
   }