feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix crash when restoring settings in registerShortcut

Browse Source 
Introduced by c5cc4b1f13

Change-Id: Id546a4cf87cfb3709f11ee32439662fcda00bdd4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2014-02-27 17:10:24 +01:00
parent 0ba55199b2
commit e4c2f569a8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/actionmanager/actionmanager.cpp
View File

@@ -283,7 +283,6 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
} else { } else {
sc = new Shortcut(id); sc = new Shortcut(id);
d->m_idCmdMap.insert(id, sc); d->m_idCmdMap.insert(id, sc);
d->readUserSettings(id, sc);
} }
if (sc->shortcut()) { if (sc->shortcut()) {
@@ -299,6 +298,7 @@ Command *ActionManager::registerShortcut(QShortcut *shortcut, Id id, const Conte
sc->setShortcut(shortcut); sc->setShortcut(shortcut);
sc->setScriptable(scriptable); sc->setScriptable(scriptable);
sc->setContext(context); sc->setContext(context);
d->readUserSettings(id, sc);
emit m_instance->commandListChanged(); emit m_instance->commandListChanged();
emit m_instance->commandAdded(id.toString()); emit m_instance->commandAdded(id.toString());