Can now be cleanly terminated using taskkill

Author: Brian Kendall

main.cpp

@@ -9,8 +9,6 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QMainWidget *mainWidget;
-    //ControllerWindow w;
-    //w.show();
 
     if (!SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS)) {
         qWarning() << "Warning: failed to set process priority. Error:" << GetLastError();
@@ -22,6 +20,10 @@ int main(int argc, char *argv[])
 
     int result = a.exec();
 
+    qDebug() << "Shutting down...";
+    mainWidget->deinitialize();
     delete mainWidget;
+    
+    qDebug() << "Done";
     return result;
 }

qmainwidget.cpp

@@ -45,6 +45,16 @@ QMainWidget::QMainWidget(QWidget *parent) :
     controllerRemapper->start();
 }
 
+void QMainWidget::deinitialize()
+{
+    if (controllerWindow) {
+        controllerWindow->close();
+    }
+    
+    controllerRemapper->exit(0);
+    controllerRemapper->wait(5000);
+}
+
 void QMainWidget::createTrayIcon()
 {
     QSystemTrayIcon *trayIcon = new QSystemTrayIcon(this);
@@ -53,7 +63,7 @@ void QMainWidget::createTrayIcon()
     QAction *quitAction = new QAction("Shutdown xboxToVJoy", this);
 
     connect(windowAction, SIGNAL(triggered()), this, SLOT(showControllerWindow()));
-    connect(quitAction, SIGNAL(triggered()), this, SLOT(quit()));
+    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
 
     menu->addAction(windowAction);
     menu->addSeparator();
@@ -66,17 +76,6 @@ void QMainWidget::createTrayIcon()
     trayIcon->show();
 }
 
-void QMainWidget::quit()
-{
-    if (controllerWindow) {
-        controllerWindow->close();
-    }
-    
-    controllerRemapper->exit(0);
-    controllerRemapper->wait(5000);
-    qApp->quit();
-}
-
 void QMainWidget::error(QString msg)
 {
     QMessageBox msgBox;
@@ -104,3 +103,8 @@ void QMainWidget::controllerWindowDestroyed()
     controllerWindow = NULL;
 }
 
+void QMainWidget::closeEvent(QCloseEvent *event)
+{
+    qApp->quit();
+    event->ignore();
+}

qmainwidget.h

@@ -2,6 +2,7 @@
 #define QMAINWIDGET_H
 
 #include <QWidget>
+#include <QCloseEvent>
 #include "controllerremapper.h"
 #include "controllerwindow.h"
 
@@ -10,18 +11,19 @@ class QMainWidget : public QWidget
     Q_OBJECT
 public:
     explicit QMainWidget(QWidget *parent = 0);
+    void deinitialize();
 
 signals:
 
 public slots:
-    void quit();
     void error(QString msg);
     void showControllerWindow();
     void controllerWindowDestroyed();
 
 private:
     void createTrayIcon();
     void startControllerMapperThread();
+    void closeEvent(QCloseEvent *event);
 
     ControllerRemapper *controllerRemapper;
     ControllerWindow *controllerWindow;