diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-31 16:13:23 -0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-02 15:37:05 -0200 |
| commit | 0f69668fc61f7453b4c6451186b515762532c35a (patch) | |
| tree | ad7398e3270119d49a35052c88a2bd27400f7556 /src/core/hle/service/hid/hid.cpp | |
| parent | c4208c1171afe5522f1237480a49aac855313ff8 (diff) | |
HID: Fix crash when pressing a key when the emulator is stopped
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 835055af..b6e4861d 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -30,6 +30,8 @@ static s16 next_circle_y = 0; * Gets a pointer to the PadData structure inside HID shared memory */ static inline PadData* GetPadData() { + if (g_shared_mem == nullptr) + return nullptr; return reinterpret_cast<PadData*>(g_shared_mem->GetPointer().ValueOr(nullptr)); } |