mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-04 15:19:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6642 from leoetlino/stm

Browse source 
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
commit 6224b9bd37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
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;