aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/motion_emu.cpp
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2017-08-22 11:43:44 +0300
committerwwylele <wwylele@gmail.com>2017-08-22 11:43:44 +0300
commit4d058cfb768c10807359a1ffd2dbaf1eac589c1c (patch)
tree2d7a5e55313ef7f421b6d47f7cee86421af0699e /src/input_common/motion_emu.cpp
parentf84c965decc31a346a901e6536474a24997f2b08 (diff)
motion_emu: fix initialization order
Diffstat (limited to 'src/input_common/motion_emu.cpp')
-rw-r--r--src/input_common/motion_emu.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp
index a1761f1846..59a035e701 100644
--- a/src/input_common/motion_emu.cpp
+++ b/src/input_common/motion_emu.cpp
@@ -74,11 +74,14 @@ private:
bool is_tilting = false;
Common::Event shutdown_event;
- std::thread motion_emu_thread;
std::tuple<Math::Vec3<float>, Math::Vec3<float>> status;
std::mutex status_mutex;
+ // Note: always keep the thread declaration at the end so that other objects are initialized
+ // before this!
+ std::thread motion_emu_thread;
+
void MotionEmuThread() {
auto update_time = std::chrono::steady_clock::now();
Math::Quaternion<float> q = MakeQuaternion(Math::Vec3<float>(), 0);