diff options
| author | Robert Adam <dev@robert-adam.de> | 2022-09-09 13:57:15 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2022-09-09 14:03:49 +0300 |
| commit | a8b98487d49f536097eb248dd8a2d02c06cba155 (patch) | |
| tree | 176764381204ca5599ff39c5a7c40371c943c1e9 /src | |
| parent | 7c08eaba1e42b3b9c93efe069446e0981a85cd53 (diff) | |
FIX(client): Clear shortcut data also for user-types
Up to now the logic for clearing shortcut data upon a change in the
shortcut config window was to see if the type() of the current data
matches that of the shortcut's default data. However, for user-defined
types QVariant::type() always returns QVariant::UserType and thus
different user-defined types could not be distinguished.
If we instead use QVariant::userType(), this problem does no longer
exist.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/GlobalShortcut.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index b0998f20c..04bbe4f91 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -665,7 +665,7 @@ void GlobalShortcutConfig::on_qtwShortcuts_itemChanged(QTreeWidgetItem *item, in sc.bSuppress = item->checkState(3) == Qt::Checked; const ::GlobalShortcut *gs = GlobalShortcutEngine::engine->qmShortcuts.value(sc.iIndex); - if (gs && sc.qvData.type() != gs->qvDefault.type()) { + if (gs && sc.qvData.userType() != gs->qvDefault.userType()) { item->setData(1, Qt::DisplayRole, gs->qvDefault); } } |