ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix input crashes when no game was loaded

This commit is contained in:
Vicki Pfau 2017-07-12 20:20:04 -07:00
parent bcb1617a69
commit 298d5e9689
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/qt/GamepadAxisEvent.cpp
View File

@ -20,7 +20,7 @@ GamepadAxisEvent::GamepadAxisEvent(int axis, Direction direction, bool isNew, in
, m_key(GBA_KEY_NONE) , m_key(GBA_KEY_NONE)
{ {
ignore(); ignore();
if (controller) { if (controller && controller->map()) {
m_key = static_cast<GBAKey>(mInputMapAxis(controller->map(), type, axis, direction * INT_MAX)); m_key = static_cast<GBAKey>(mInputMapAxis(controller->map(), type, axis, direction * INT_MAX));
} }
} }

2
src/platform/qt/GamepadButtonEvent.cpp
View File

@ -19,7 +19,7 @@ GamepadButtonEvent::GamepadButtonEvent(QEvent::Type pressType, int button, int t
, m_key(GBA_KEY_NONE) , m_key(GBA_KEY_NONE)
{ {
ignore(); ignore();
if (controller) { if (controller && controller->map()) {
m_key = static_cast<GBAKey>(mInputMapKey(controller->map(), type, button)); m_key = static_cast<GBAKey>(mInputMapKey(controller->map(), type, button));
} }
} }

2
src/platform/qt/GamepadHatEvent.cpp
View File

@ -20,7 +20,7 @@ GamepadHatEvent::GamepadHatEvent(QEvent::Type pressType, int hatId, Direction di
, m_key(GBA_KEY_NONE) , m_key(GBA_KEY_NONE)
{ {
ignore(); ignore();
if (controller) { if (controller && controller->map()) {
m_key = static_cast<GBAKey>(mInputMapHat(controller->map(), type, hatId, direction)); m_key = static_cast<GBAKey>(mInputMapHat(controller->map(), type, hatId, direction));
} }
} }

3
src/platform/qt/input/InputController.cpp
View File

@ -366,6 +366,9 @@ void InputController::updateJoysticks() {
} }
const mInputMap* InputController::map() { const mInputMap* InputController::map() {
if (!m_activeKeyInfo) {
return nullptr;
}
return &m_inputMap; return &m_inputMap;
} }