various fixes

2018-07-22 10:21:47 +01:00
parent c340901419
commit ce4d7fda60
14 changed files with 114 additions and 63 deletions
@@ -63,7 +63,9 @@ void PreferencesDialog::setup_kbd_shortcuts(QMenuBar* menubar) {
        }
    }
    for (int i=0;i<added_action_items.size();i++) {
-        KeySequenceEditor* editor = new KeySequenceEditor(added_actions.at(i));
-        ui->treeWidget->setItemWidget(added_action_items.at(i), 1, editor);
+        if (added_actions.at(i)->menu() == NULL) {
+            KeySequenceEditor* editor = new KeySequenceEditor(added_actions.at(i));
+            ui->treeWidget->setItemWidget(added_action_items.at(i), 1, editor);
+        }
    }
 }