summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-10-13 22:18:03 -0700
committerarchshift <admin@archshift.com>2014-10-13 22:18:03 -0700
commit366ae1b351e7a22fc24e625b516c2d1877543444 (patch)
tree302dc56f751995a4e7d0985913a4ba3c2f3202d0 /src
parente4905143c8bc1ea8a2c736e025db234fdd82aea8 (diff)
hid.cpp: Fixed crash when updating pad data while null
Fixes #137
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp
index b6ec1b8ff..ef38a5603 100644
--- a/src/core/hle/service/hid.cpp
+++ b/src/core/hle/service/hid.cpp
@@ -78,6 +78,10 @@ void PadButtonRelease(PadState pad_state) {
void PadUpdateComplete() {
PadData* pad_data = GetPadData();
+ if (pad_data == nullptr) {
+ return;
+ }
+
// Update PadData struct
pad_data->current_state.hex = next_state.hex;
pad_data->index = next_index;