Fix thread logic

Eeems-Org · Jan 16, 2024 · 45747b3 · 45747b3
1 parent 98dbe2f
commit 45747b3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/applications/system-service/keyboarddevice.cpp b/applications/system-service/keyboarddevice.cpp
@@ -7,7 +7,6 @@ KeyboardDevice::KeyboardDevice(QThread* handler, event_device device)
   device(device),
   sys("/sys/class/input/" + devName() + "/device/")
 {
-    moveToThread(handler);
     _name = sys.strProperty("name").c_str();
     device.lock();
     notifier = new QSocketNotifier(device.fd, QSocketNotifier::Read, this);

diff --git a/applications/system-service/keyboardhandler.cpp b/applications/system-service/keyboardhandler.cpp
@@ -1,6 +1,4 @@
 #include "keyboardhandler.h"
-#include "eventlistener.h"
-#include "buttonhandler.h"
 
 #include <QFileInfo>
 #include <QKeyEvent>
@@ -12,6 +10,7 @@ KeyboardHandler* KeyboardHandler::init(){
         return instance;
     }
     instance = new KeyboardHandler();
+    instance->moveToThread(instance);
     instance->start();
     return instance;
 }
@@ -662,7 +661,6 @@ void KeyboardHandler::reloadDevices(){
         }
         if(!hasDevice(device) && device.fd != -1){
             auto keyboard = new KeyboardDevice(this, device);
-            keyboard->moveToThread(this);
             O_DEBUG(keyboard->name() << "added");
             devices.append(keyboard);
             keyboard->readEvents();