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

Merge pull request #6642 from leoetlino/stm 

IOS/STM: Reset the event hook at the correct time
This commit is contained in:
Mat M 2018-04-16 09:04:12 -04:00 committed by GitHub
parent 1cd75f9b19 8bae4b7e51
commit 6224b9bd37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/IOS/STM/STM.cpp
View File

@ -66,10 +66,9 @@ IPCCommandResult STMImmediate::IOCtl(const IOCtlRequest& request)
return GetDefaultReply(return_value); return GetDefaultReply(return_value);
} }
IPCCommandResult STMEventHook::Close(u32 fd) STMEventHook::~STMEventHook()
{ {
s_event_hook_request.reset(); s_event_hook_request.reset();
return Device::Close(fd);
} }
IPCCommandResult STMEventHook::IOCtl(const IOCtlRequest& request) IPCCommandResult STMEventHook::IOCtl(const IOCtlRequest& request)

2
Source/Core/Core/IOS/STM/STM.h
View File

@ -55,7 +55,7 @@ class STMEventHook final : public Device
{ {
public: public:
using Device::Device; using Device::Device;
IPCCommandResult Close(u32 fd) override; ~STMEventHook() override;
IPCCommandResult IOCtl(const IOCtlRequest& request) override; IPCCommandResult IOCtl(const IOCtlRequest& request) override;
void DoState(PointerWrap& p) override; void DoState(PointerWrap& p) override;