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

m-kuhn · jef-n · commit addcf3cbdac3 · 2016-03-23T21:38:46.000+01:00
Fix #14528 (cherry picked from commit 76296c8)
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();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,8 @@ void QgsConfigureShortcutsDialog::loadShortcuts()`
`224`	`224`	`actionName = child.attribute( "name" );`
`225`	`225`	`actionShortcut = child.attribute( "shortcut" );`
`226`	`226`	`action = QgsShortcutsManager::instance()->actionByName( actionName );`
`227`		`- QgsShortcutsManager::instance()->setActionShortcut( action, actionShortcut );`
	`227`	`+ if ( action )`
	`228`	`+ QgsShortcutsManager::instance()->setActionShortcut( action, actionShortcut );`
`228`	`229`	`child = child.nextSiblingElement();`
`229`	`230`	`}`
`230`	`231`