# HG changeset patch # User Santeri Piippo # Date 1373916436 -10800 # Node ID 751d31336f08d6dbc7835c0f0d477d96d883830f # Parent b136331072a0566a3dfe0f3c560b78151326147a fixed config dialog crashing diff -r b136331072a0 -r 751d31336f08 src/configDialog.cpp --- a/src/configDialog.cpp Mon Jul 15 22:25:00 2013 +0300 +++ b/src/configDialog.cpp Mon Jul 15 22:27:16 2013 +0300 @@ -123,10 +123,10 @@ void ConfigDialog::addShortcut (keyseqconfig& cfg, QAction* act, ulong& i) { ShortcutListItem* item = new ShortcutListItem; - setShortcutText (item); item->setIcon (act->icon()); item->setKeyConfig (&cfg); item->setAction (act); + setShortcutText (item); // If the action doesn't have a valid icon, use an empty one // so that the list is kept aligned. @@ -561,8 +561,7 @@ // ============================================================================= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ============================================================================= -void ConfigDialog::setShortcutText( ShortcutListItem* item ) -{ +void ConfigDialog::setShortcutText( ShortcutListItem* item ) { QAction* act = item->action(); str label = act->iconText(); str keybind = item->keyConfig()->value.toString();