Commit shortcut editor before adding/removing

2 files changed, 8 insertions, 0 deletions

diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp
index 12947cfcd..dc196b444 100644
--- a/src/mumble/GlobalShortcut.cpp
+++ b/src/mumble/GlobalShortcut.cpp
@@ -608,7 +608,12 @@ GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) {
 	}
 }
 
+void GlobalShortcutConfig::commit() {
+	qtwShortcuts->closePersistentEditor(qtwShortcuts->currentItem(), qtwShortcuts->currentColumn());
+}
+
 void GlobalShortcutConfig::on_qpbAdd_clicked(bool) {
+	commit();
 	Shortcut sc;
 	sc.iIndex = -1;
 	sc.bSuppress = false;
@@ -617,6 +622,7 @@ void GlobalShortcutConfig::on_qpbAdd_clicked(bool) {
 }
 
 void GlobalShortcutConfig::on_qpbRemove_clicked(bool) {
+	commit();
 	QTreeWidgetItem *qtwi = qtwShortcuts->currentItem();
 	if (! qtwi)
 		return;
@@ -631,6 +637,7 @@ void GlobalShortcutConfig::on_qtwShortcuts_currentItemChanged(QTreeWidgetItem *i
 
 void GlobalShortcutConfig::on_qtwShortcuts_itemChanged(QTreeWidgetItem *item, int) {
 	int idx = qtwShortcuts->indexOfTopLevelItem(item);
+
 	Shortcut &sc = qlShortcuts[idx];
 	sc.iIndex = item->data(0, Qt::DisplayRole).toInt();
 	sc.qvData = item->data(1, Qt::DisplayRole);
diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h
index 982a8f5f9..be1103ede 100644
--- a/src/mumble/GlobalShortcut.h
+++ b/src/mumble/GlobalShortcut.h
@@ -174,6 +174,7 @@ class GlobalShortcutConfig : public ConfigWidget, public Ui::GlobalShortcut {
 		void load(const Settings &r);
 		void reload();
 		bool expert(bool);
+		void commit();
 		void on_qpbAdd_clicked(bool);
 		void on_qpbRemove_clicked(bool);
 		void on_qtwShortcuts_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);