Merge pull request #5972 from leoetlino/close

WiimoteReal: Fix device handles not being closed
dolphin-emu · Aug 28, 2017 · 378416f · 378416f
2 parents 297c0c8 + 52f26d4
commit 378416f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -25,6 +25,7 @@
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
+#include "Common/ScopeGuard.h"
 #include "Common/Thread.h"
 #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
 #include "Core/HW/WiimoteReal/IOWin.h"
@@ -366,6 +367,8 @@ static bool IsWiimote(const std::basic_string<TCHAR>& device_path, WinWriteMetho
   if (dev_handle == INVALID_HANDLE_VALUE)
     return false;
 
+  Common::ScopeGuard handle_guard{[&dev_handle] { CloseHandle(dev_handle); }};
+
   u8 buf[MAX_PAYLOAD];
   u8 const req_status_report[] = {WR_SET_REPORT | BT_OUTPUT, RT_REQUEST_STATUS, 0};
   int invalid_report_count = 0;