From 8c6449a886ef415763e7593a621e39216de618d0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 21 Dec 2015 16:20:06 -0700
Subject: [PATCH] fix for stopping a nullptr QTimer

---
 libraries/networking/src/NodeList.cpp           | 2 +-
 libraries/networking/src/ThreadedAssignment.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index e591ee8a31..5075d78597 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -94,7 +94,7 @@ NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned
     _keepAlivePingTimer.setInterval(KEEPALIVE_PING_INTERVAL_MS);
     connect(&_keepAlivePingTimer, &QTimer::timeout, this, &NodeList::sendKeepAlivePings);
     connect(&_domainHandler, SIGNAL(connectedToDomain(QString)), &_keepAlivePingTimer, SLOT(start()));
-    connect(&_domainHandler, &DomainHandler::disconnectedFromDomain, this, &NodeList::stopKeepalivePingTimer);
+    connect(&_domainHandler, &DomainHandler::disconnectedFromDomain, &_keepAlivePingTimer, &QTimer::stop);
 
     // we definitely want STUN to update our public socket, so call the LNL to kick that off
     startSTUNPublicSocketUpdate();
diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp
index 9aeddbc99c..2f5ab7a015 100644
--- a/libraries/networking/src/ThreadedAssignment.cpp
+++ b/libraries/networking/src/ThreadedAssignment.cpp
@@ -122,8 +122,10 @@ void ThreadedAssignment::startSendingStats() {
 }
 
 void ThreadedAssignment::stopSendingStats() {
-    // stop sending stats, we just disconnected from domain
-    _statsTimer->stop();
+    if (_statsTimer) {
+        // stop sending stats, we just disconnected from domain
+        _statsTimer->stop();
+    }
 }
 
 void ThreadedAssignment::checkInWithDomainServerOrExit() {