From e4c2f569a8bb5dddec42f08023caf7614d55578b Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 27 Feb 2014 17:10:24 +0100
Subject: [PATCH] Fix crash when restoring settings in registerShortcut
Introduced by c5cc4b1f131cbfc84622a93716ed421dd57f4da5
Change-Id: Id546a4cf87cfb3709f11ee32439662fcda00bdd4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/coreplugin/actionmanager/actionmanager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 93f31496029..271b883f032 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -283,7 +283,6 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
} else {
sc = new Shortcut(id);
d->m_idCmdMap.insert(id, sc);
- d->readUserSettings(id, sc);
}
if (sc->shortcut()) {
@@ -299,6 +298,7 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
sc->setShortcut(shortcut);
sc->setScriptable(scriptable);
sc->setContext(context);
+ d->readUserSettings(id, sc);
emit m_instance->commandListChanged();
emit m_instance->commandAdded(id.toString());
--
GitLab