From 7c7d727b55a878d4a3610dff083be0067502f5cb Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 26 Feb 2015 10:07:48 -0800
Subject: [PATCH] mv ShutdownEventListener into class which is a child of
 QCoreApplication

---
 assignment-client/src/AssignmentClient.cpp    |  7 -------
 assignment-client/src/AssignmentClientApp.cpp | 15 +++++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 38f5c7cc55..86680d2f03 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -58,13 +58,6 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
     // when the domain server hands over an assignment.
     QUuid nodeUUID = QUuid::createUuid();
     nodeList->setSessionUUID(nodeUUID);
-    
-    // setup a shutdown event listener to handle SIGTERM or WM_CLOSE for us
-#ifdef _WIN32
-    installNativeEventFilter(&ShutdownEventListener::getInstance());
-#else
-    ShutdownEventListener::getInstance();
-#endif
 
     // set the logging target to the the CHILD_TARGET_NAME
     LogHandler::getInstance().setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME);
diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index 6e269f35b7..7c6fb50db2 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -29,6 +29,14 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     setvbuf(stdout, NULL, _IOLBF, 0);
 #   endif
 
+
+#   ifdef _WIN32
+    installNativeEventFilter(&ShutdownEventListener::getInstance());
+#   else
+    ShutdownEventListener::getInstance();
+#   endif
+
+
     setOrganizationName("High Fidelity");
     setOrganizationDomain("highfidelity.io");
     setApplicationName("assignment-client");
@@ -175,16 +183,11 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
 
     if (numForks || minForks || maxForks) {
         // setup a shutdown event listener to handle SIGTERM or WM_CLOSE for us
-#       ifdef _WIN32
-        installNativeEventFilter(&ShutdownEventListener::getInstance());
-#       else
-        ShutdownEventListener::getInstance();
-#       endif
-
         AssignmentClientMonitor monitor(numForks, minForks, maxForks, assignmentPool,
                                         walletUUID, assignmentServerHostname, assignmentServerPort);
         exec();
     } else {
+    // setup a shutdown event listener to handle SIGTERM or WM_CLOSE for us
         AssignmentClient client(requestAssignmentType, assignmentPool,
                                 walletUUID, assignmentServerHostname, assignmentServerPort);
         exec();