summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-01-02 08:19:42 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2019-01-02 08:19:42 -0600
commit25d43ffd988775e63c3dfc302f9f6ec2c2eb71da (patch)
treec954a619739ba3ff52490483e175edca2bd1210e /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
parentcddb83fd06cb5436e24ac5de9e578806fd7168a4 (diff)
ControllerInterface: Shutdown order and race condition fix.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index d5567222a4..0d712e5245 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -56,7 +56,7 @@ public:
private:
std::vector<std::function<void()>> m_devices_changed_callbacks;
mutable std::mutex m_callbacks_mutex;
- bool m_is_init;
+ std::atomic<bool> m_is_init;
std::atomic<bool> m_is_populating_devices{false};
WindowSystemInfo m_wsi;
};