api/shortcuts, tracker/joy: adapt to synchronized joy api

1 files changed, 5 insertions, 4 deletions

diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 28846809..1ca1441c 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -10,20 +10,21 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     {
-        win32_joy_ctx joy_ctx;
+        win32_joy_ctx& joy_ctx(win32_joy_ctx::make());
         
         _joys = QList<joys>();
         
-        for (auto& j : joy_ctx.joys())
-            _joys.push_back(joys { j.second->name, j.first });
+        for (auto j : joy_ctx.get_joy_info())
+            _joys.push_back(joys { j.name, j.guid });
     }
     
     {
+        const QString guid = s.guid;
         int idx = 0;
         for (int i = 0; i < _joys.size(); i++)
         {
             const joys& j = _joys[i];
-            if (j.guid == s.guid && j.name == s.joyid)
+            if (j.guid == guid)
                 idx = i;
             ui.joylist->addItem(j.name + " " + j.guid);
         }