Fix issue #46

FRC-Utilities · Jan 18, 2017 · 5d79337 · 5d79337
1 parent 1f95699
commit 5d79337
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/lib/QJoysticks/src/QJoysticks.cpp b/lib/QJoysticks/src/QJoysticks.cpp
@@ -21,7 +21,6 @@
  */
 
 #include <QDebug>
-#include <QThread>
 #include <QSettings>
 #include <QJoysticks.h>
 #include <QJoysticks/SDL_Joysticks.h>
@@ -33,14 +32,6 @@ QJoysticks::QJoysticks()
     m_sdlJoysticks = new SDL_Joysticks;
     m_virtualJoystick = new VirtualJoystick;
 
-    /* Move SDL handler to another thread */
-    m_thread = new QThread;
-    m_thread->start (QThread::NormalPriority);
-    m_sdlJoysticks->moveToThread (m_thread);
-
-    /* Destroy the thread when it quits */
-    connect (m_thread, SIGNAL (finished()), m_thread, SLOT (deleteLater()));
-
     /* Configure SDL joysticks */
     connect (sdlJoysticks(),    &SDL_Joysticks::POVEvent,
              this,              &QJoysticks::POVEvent);
@@ -80,8 +71,6 @@ QJoysticks::~QJoysticks()
     delete m_settings;
     delete m_sdlJoysticks;
     delete m_virtualJoystick;
-
-    m_thread->exit();
 }
 
 /**

diff --git a/lib/QJoysticks/src/QJoysticks.h b/lib/QJoysticks/src/QJoysticks.h
@@ -112,7 +112,6 @@ private slots:
 private:
     bool m_sortJoyticks;
 
-    QThread* m_thread;
     QSettings* m_settings;
     SDL_Joysticks* m_sdlJoysticks;
     VirtualJoystick* m_virtualJoystick;