all repos — mgba @ d5a60984484df39ebf1fe6b5421128e838e0ee08

mGBA Game Boy Advance Emulator

Qt: Fix potential crash if a gamepad causes focus to change
Jeffrey Pfau jeffrey@endrift.com
Tue, 14 Apr 2015 20:46:41 -0700
commit

d5a60984484df39ebf1fe6b5421128e838e0ee08

parent

8891abaca842dab75858c52a9c13feb20c0bfc51

2 files changed, 5 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -11,6 +11,7 @@ - Qt: Fix window not regaining focus after exiting savestate window

- Qt: Fix regression where video would not record if the game had already started - GBA: Fix rewind boundary conditions - GBA: Add initial I/O register settings for background matrix registers + - Qt: Fix potential crash if a gamepad causes focus to change Misc: - Qt: Show multiplayer numbers in window title
M src/platform/qt/InputController.cppsrc/platform/qt/InputController.cpp

@@ -290,6 +290,10 @@ }

QApplication::sendEvent(QApplication::focusWidget(), event); } + if (!QApplication::focusWidget()) { + return; + } + activeButtons.subtract(oldButtons); oldButtons.subtract(m_activeButtons);