Qt: Fix inability to clear default keybindings
Vicki Pfau vi@endrift.com
Mon, 30 Dec 2019 18:19:14 -0800
2 files changed,
5 insertions(+),
2 deletions(-)
M
CHANGES
→
CHANGES
@@ -105,6 +105,7 @@ - Qt: Fix division by zero error in invalid TilePainter state
- Qt: Fix "restart needed" dialog after first config (fixes mgba.io/i/1601) - Qt: Fix undesired screen filtering when paused (fixes mgba.io/i/1602) - Qt: Fix sprite view using wrong base address (fixes mgba.io/i/1603) + - Qt: Fix inability to clear default keybindings Misc: - GB Memory: Support manual SRAM editing (fixes mgba.io/i/1580) - GBA I/O: Stop logging several harmless invalid register reads
M
src/platform/qt/ActionMapper.cpp
→
src/platform/qt/ActionMapper.cpp
@@ -72,8 +72,10 @@ if (action->isActive()) {
qaction->setChecked(true); } const Shortcut* shortcut = shortcuts.shortcut(actionName); - if (shortcut && shortcut->shortcut() > 0) { - qaction->setShortcut(QKeySequence(shortcut->shortcut())); + if (shortcut) { + if (shortcut->shortcut() > 0) { + qaction->setShortcut(QKeySequence(shortcut->shortcut())); + } } else if (!m_defaultShortcuts[actionName].isEmpty()) { qaction->setShortcut(m_defaultShortcuts[actionName][0]); }