Merge pull request #6642 from leoetlino/stm

IOS/STM: Reset the event hook at the correct time
dolphin-emu · Apr 16, 2018 · 6224b9b · 6224b9b
2 parents 1cd75f9 + 8bae4b7
commit 6224b9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Source/Core/Core/IOS/STM/STM.cpp b/Source/Core/Core/IOS/STM/STM.cpp
@@ -66,10 +66,9 @@ IPCCommandResult STMImmediate::IOCtl(const IOCtlRequest& request)
   return GetDefaultReply(return_value);
 }
 
-IPCCommandResult STMEventHook::Close(u32 fd)
+STMEventHook::~STMEventHook()
 {
   s_event_hook_request.reset();
-  return Device::Close(fd);
 }
 
 IPCCommandResult STMEventHook::IOCtl(const IOCtlRequest& request)

diff --git a/Source/Core/Core/IOS/STM/STM.h b/Source/Core/Core/IOS/STM/STM.h
@@ -55,7 +55,7 @@ class STMEventHook final : public Device
 {
 public:
   using Device::Device;
-  IPCCommandResult Close(u32 fd) override;
+  ~STMEventHook() override;
   IPCCommandResult IOCtl(const IOCtlRequest& request) override;
   void DoState(PointerWrap& p) override;