From 9ee62a8a383bcd80599462ab52ad275e265c0cf0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 10 Jul 2015 17:52:51 -0700
Subject: [PATCH] fix for connection denied packet in Application

---
 interface/src/Application.cpp | 19 ++++++++-----------
 interface/src/Application.h   |  3 +--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 98d9325403..4698ff4993 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3815,16 +3815,8 @@ void Application::domainChanged(const QString& domainHostname) {
     _domainConnectionRefusals.clear();
 }
 
-void Application::domainConnectionDenied(const QString& reason) {
-    if (!_domainConnectionRefusals.contains(reason)) {
-        _domainConnectionRefusals.append(reason);
-        emit domainConnectionRefused(reason);
-    }
-}
-
-void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr) {
-    int headerSize = numBytesForPacketHeaderGivenPacketType(PacketType::DomainConnectionDenied);
-    QDataStream packetStream(QByteArray::fromRawData(packet->getData(), packet->getSizeWithHeader()));
+void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> packet, SharedNodePointer senderNode) {
+    QDataStream packetStream(packet.data());
 
     QString reason;
     packetStream >> reason;
@@ -3833,7 +3825,12 @@ void Application::handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket> pa
     // and check and signal for an access token so that we can make sure they are logged in
     qCDebug(interfaceapp) << "The domain-server denied a connection request: " << reason;
     qCDebug(interfaceapp) << "You may need to re-log to generate a keypair so you can provide a username signature.";
-    domainConnectionDenied(reason);
+
+    if (!_domainConnectionRefusals.contains(reason)) {
+        _domainConnectionRefusals.append(reason);
+        emit domainConnectionRefused(reason);
+    }
+
     AccountManager::getInstance().checkAndSignalForAccessToken();
 }
 
diff --git a/interface/src/Application.h b/interface/src/Application.h
index c3f31a107c..ae3661579b 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -443,8 +443,7 @@ public slots:
 
     void notifyPacketVersionMismatch();
 
-    void domainConnectionDenied(const QString& reason);
-    void handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket>, SharedNodePointer senderNode, HifiSockAddr senderSockAddr);
+    void handleDomainConnectionDeniedPacket(QSharedPointer<NLPacket>, SharedNodePointer senderNode);
 
     void cameraMenuChanged();