From cc9c87d281a88a82de7551abfebcfd7e0952d3ae Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 1 Mar 2016 11:31:02 -0800
Subject: [PATCH] Fix packet version mismatch not showing for domain packets

---
 interface/src/Application.cpp              | 11 +++--------
 interface/src/Application.h                |  2 +-
 libraries/networking/src/DomainHandler.cpp |  2 ++
 libraries/networking/src/DomainHandler.h   |  1 +
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 89ec196fad..a2fdd3c8ac 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -549,7 +549,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     const DomainHandler& domainHandler = nodeList->getDomainHandler();
 
     connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
-    connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(connectedToDomain(const QString&)));
+    connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
     connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle()));
     connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
     connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails()));
@@ -3987,13 +3987,8 @@ void Application::handleDomainConnectionDeniedPacket(QSharedPointer<ReceivedMess
     AccountManager::getInstance().checkAndSignalForAccessToken();
 }
 
-void Application::connectedToDomain(const QString& hostname) {
-    AccountManager& accountManager = AccountManager::getInstance();
-    const QUuid& domainID = DependencyManager::get<NodeList>()->getDomainHandler().getUUID();
-
-    if (accountManager.isLoggedIn() && !domainID.isNull()) {
-        _notifiedPacketVersionMismatchThisDomain = false;
-    }
+void Application::resettingDomain() {
+    _notifiedPacketVersionMismatchThisDomain = false;
 }
 
 void Application::nodeAdded(SharedNodePointer node) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 8cc2a33038..98c5937f70 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -285,7 +285,7 @@ private slots:
     void idle(uint64_t now);
     void aboutToQuit();
 
-    void connectedToDomain(const QString& hostname);
+    void resettingDomain();
 
     void audioMuteToggled();
     void faceTrackerMuteToggled();
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index db775983e1..bf27789c54 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -98,6 +98,8 @@ void DomainHandler::softReset() {
 }
 
 void DomainHandler::hardReset() {
+    emit resetting();
+
     softReset();
 
     qCDebug(networking) << "Hard reset in NodeList DomainHandler.";
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index f60ac2fbe6..957f52144b 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -104,6 +104,7 @@ signals:
     // It means that, either from DNS lookup or ICE, we think we have a socket we can talk to DS on
     void completedSocketDiscovery();
 
+    void resetting();
     void connectedToDomain(const QString& hostname);
     void disconnectedFromDomain();