mirror/antimicrox
1
0
Fork 0
mirror of https://github.com/AntiMicroX/antimicrox.git synced 2026-08-01 10:07:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Converted preset options in dialogs to use new enum values.

Browse Source
This commit is contained in:
Travis Nickles
2013-12-31 00:20:05 -06:00
parent d62f089ab5
commit b14025b4c2
10 changed files with 114 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/inputdaemon.cpp
View File

@@ -336,7 +336,6 @@ void InputDaemon::refreshJoystick(InputDevice *joystick)
void InputDaemon::quit()
{
stopped = true;
eventWorker->stop();
// Wait for SDL to finish. Let worker destructor close SDL.
// Let InputDaemon destructor close thread instance.
@@ -346,10 +345,16 @@ void InputDaemon::quit()
QTimer temptime;
connect(eventWorker, SIGNAL(finished()), &q, SLOT(quit()));
connect(&temptime, SIGNAL(timeout()), &q, SLOT(quit()));
eventWorker->stop();
temptime.start(1000);
q.exec();
temptime.stop();
}
else
{
eventWorker->stop();
}
delete eventWorker;
eventWorker = 0;