all repos — mgba @ e53df9759e84207b8a26bb22a674f740cd605129

mGBA Game Boy Advance Emulator

Qt: Fix crash double-clicking menus in shortcut settings (fixes #1627)
Vicki Pfau vi@endrift.com
Mon, 20 Jan 2020 18:11:13 -0800
commit

e53df9759e84207b8a26bb22a674f740cd605129

parent

84bddfad69bb0760d2c5734ac6a74c17f56da87b

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -114,6 +114,7 @@ - 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 - Qt: Release held actions if they get rebound + - Qt: Fix crash double-clicking menus in shortcut settings (fixes mgba.io/i/1627) - Vita: Fix analog controls (fixes mgba.io/i/1554) - Wii: Fix game fast-forwarding after slowing down - Wii: Improve audio buffering (fixes mgba.io/i/1617)
M src/platform/qt/ShortcutView.cppsrc/platform/qt/ShortcutView.cpp

@@ -61,7 +61,7 @@ return;

} QString name = m_model->name(index); const Shortcut* item = m_controller->shortcut(name); - if (!item->action()) { + if (!item || !item->action()) { return; } int shortcut = item->shortcut();