diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-02-27 17:10:24 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-27 17:13:00 +0100 |
| commit | e4c2f569a8bb5dddec42f08023caf7614d55578b (patch) | |
| tree | 7c4d61d715c3ade91568dd75e0269b48acfb4c9f /src/plugins/coreplugin/actionmanager | |
| parent | 0ba55199b26b165836bdb4500c74b8b5b641e4b0 (diff) | |
| download | qt-creator-e4c2f569a8bb5dddec42f08023caf7614d55578b.tar.gz | |
Fix crash when restoring settings in registerShortcut
Introduced by c5cc4b1f131cbfc84622a93716ed421dd57f4da5
Change-Id: Id546a4cf87cfb3709f11ee32439662fcda00bdd4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/coreplugin/actionmanager')
| -rw-r--r-- | src/plugins/coreplugin/actionmanager/actionmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index 93f3149602..271b883f03 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()); |