From 4bdcd48852a459fbd5bc6eb4452c95a3ad8b85e3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 6 Dec 2015 05:16:56 +0100
Subject: tracker/joy: adapt to non-singleton joy worker

---
 tracker-joystick/ftnoir_tracker_joystick.cpp        | 2 +-
 tracker-joystick/ftnoir_tracker_joystick.h          | 2 +-
 tracker-joystick/ftnoir_tracker_joystick_dialog.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index 112f20ca..d10b15ca 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -8,7 +8,7 @@
 #include "opentrack/plugin-api.hpp"
 #include <QMutexLocker>
 
-FTNoIR_Tracker::FTNoIR_Tracker() : joy_ctx(win32_joy_ctx::make())
+FTNoIR_Tracker::FTNoIR_Tracker()
 {
     if (static_cast<QString>(s.guid) == "")
     {
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index 9923dd1c..1f940b63 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -46,7 +46,7 @@ public:
     settings s;
     QString guid;
     static constexpr int AXIS_MAX = win32_joy_ctx::joy_axis_size - 1;
-    win32_joy_ctx& joy_ctx;
+    win32_joy_ctx joy_ctx;
 };
 
 class TrackerControls: public ITrackerDialog
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 0a630c1e..a6fa6605 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -10,7 +10,7 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     {
-        win32_joy_ctx& joy_ctx(win32_joy_ctx::make());
+        win32_joy_ctx joy_ctx;
         
         _joys = QList<joys>();
         
-- 
cgit v1.2.3