From 0918d4989b342f9380e77dc6cd2e00cbaa0483df Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 26 Feb 2015 09:53:23 -0800
Subject: [PATCH] mv ShutdownEventListener into class which is a child of
 QCoreApplication

---
 assignment-client/src/AssignmentClientApp.cpp     | 8 ++++++++
 assignment-client/src/AssignmentClientMonitor.cpp | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index 26b6b8675a..6e269f35b7 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -14,6 +14,7 @@
 #include <LogHandler.h>
 #include <SharedUtil.h>
 #include <HifiConfigVariantMap.h>
+#include <ShutdownEventListener.h>
 
 #include "Assignment.h"
 #include "AssignmentClient.h"
@@ -173,6 +174,13 @@ 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();
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 29fda05ee1..ffc402c04d 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -12,7 +12,6 @@
 #include <signal.h>
 
 #include <LogHandler.h>
-#include <ShutdownEventListener.h>
 #include <AddressManager.h>
 
 #include "AssignmentClientMonitor.h"
@@ -40,13 +39,6 @@ AssignmentClientMonitor::AssignmentClientMonitor(const unsigned int numAssignmen
 {    
     // start the Logging class with the parent's target name
     LogHandler::getInstance().setTargetName(ASSIGNMENT_CLIENT_MONITOR_TARGET_NAME);
-    
-    // setup a shutdown event listener to handle SIGTERM or WM_CLOSE for us
-#ifdef _WIN32
-    installNativeEventFilter(&ShutdownEventListener::getInstance());
-#else
-    ShutdownEventListener::getInstance();
-#endif
 
     // create a NodeList so we can receive stats from children
     DependencyManager::registerInheritance<LimitedNodeList, NodeList>();