From db1eb37b26f9ac14be4e1a4e5edbf5b6e77f8db7 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Sun, 2 Aug 2026 17:08:31 +0200 Subject: fix: report collisions between INI overrides bound to the same key loadOverrides() inserted straight into m_bindings, so two override lines that normalize to the same QKeySequence (e.g. "y" and "Y", both "Y" per QKeySequence) silently overwrote each other with zero warning, contradicting the "a typo cannot bind silently" contract on knownActions(). Track sequences seen within the current override pass separately from m_bindings (which already holds the defaults) so overriding a default key stays silent, but two colliding override lines produce one warning naming both actions. --- src/keymap.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/keymap.cpp') diff --git a/src/keymap.cpp b/src/keymap.cpp index 6e43f1b..205d2f5 100644 --- a/src/keymap.cpp +++ b/src/keymap.cpp @@ -48,6 +48,14 @@ void KeyMap::loadOverrides(QSettings &settings) { const QStringList known = knownActions(); + // Sequences bound so far *within this override pass*. Defaults already + // sit in m_bindings before this runs, so a plain m_bindings.contains() + // check would misfire on every legitimate override of a default (e.g. + // "j=archive" overriding the default 'j' binding). Only a collision + // between two entries in this same pass (e.g. two INI keys that + // normalize to the same QKeySequence, such as "y" and "Y") is a bug. + QHash seenThisPass; + settings.beginGroup(QStringLiteral("keys")); const QStringList keys = settings.childKeys(); for (const QString &key : keys) { @@ -71,6 +79,16 @@ void KeyMap::loadOverrides(QSettings &settings) continue; } + const auto previous = seenThisPass.constFind(sequence); + if (previous != seenThisPass.constEnd()) { + m_warnings.append( + QStringLiteral("Key sequence '%1' bound to both '%2' and '%3' " + "in [keys]; keeping '%2'") + .arg(key, previous.value(), action)); + continue; + } + seenThisPass.insert(sequence, action); + m_bindings.insert(sequence, action); } settings.endGroup(); -- cgit v1.2.3