diff options
| author | 2014-10-13 22:18:03 -0700 | |
|---|---|---|
| committer | 2014-10-13 22:18:03 -0700 | |
| commit | 366ae1b351e7a22fc24e625b516c2d1877543444 (patch) | |
| tree | 302dc56f751995a4e7d0985913a4ba3c2f3202d0 /src/core | |
| parent | Merge pull request #113 from neobrain/opengl_refactor (diff) | |
| download | yuzu-366ae1b351e7a22fc24e625b516c2d1877543444.tar.gz yuzu-366ae1b351e7a22fc24e625b516c2d1877543444.tar.xz yuzu-366ae1b351e7a22fc24e625b516c2d1877543444.zip | |
hid.cpp: Fixed crash when updating pad data while null
Fixes #137
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid.cpp | 4 |
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) { | |||
| 78 | void PadUpdateComplete() { | 78 | void PadUpdateComplete() { |
| 79 | PadData* pad_data = GetPadData(); | 79 | PadData* pad_data = GetPadData(); |
| 80 | 80 | ||
| 81 | if (pad_data == nullptr) { | ||
| 82 | return; | ||
| 83 | } | ||
| 84 | |||
| 81 | // Update PadData struct | 85 | // Update PadData struct |
| 82 | pad_data->current_state.hex = next_state.hex; | 86 | pad_data->current_state.hex = next_state.hex; |
| 83 | pad_data->index = next_index; | 87 | pad_data->index = next_index; |