diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h index 93a53dfe50..d15f85481d 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h @@ -13,10 +13,12 @@ class WiimoteScannerDarwin final : public WiimoteScannerBackend { public: WiimoteScannerDarwin() = default; - ~WiimoteScannerDarwin() override = default; + ~WiimoteScannerDarwin() override; bool IsReady() const override; void FindWiimotes(std::vector&, Wiimote*&) override; void Update() override {} // not needed +private: + bool stopScanning = false; }; } diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm index f0743dc6d6..dfb077c54e 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm +++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm @@ -21,6 +21,11 @@ namespace WiimoteReal { +WiimoteScannerDarwin::~WiimoteScannerDarwin() +{ + stopScanning = true; +} + void WiimoteScannerDarwin::FindWiimotes(std::vector& found_wiimotes, Wiimote*& found_board) { @@ -55,7 +60,7 @@ void WiimoteScannerDarwin::FindWiimotes(std::vector& found_wiimotes, do { CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false); - } while (!sbt->done); + } while (!sbt->done && !stopScanning); int found_devices = [[bti foundDevices] count];