From 0d920c7b7c4e9bf8c85bedc108b8e608b4748e31 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 10 Jul 2015 16:14:23 -0700 Subject: [PATCH] Update method name in AssignmentClient --- assignment-client/src/AssignmentClient.cpp | 7 +++---- assignment-client/src/AssignmentClient.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 971da41df6..dda505429d 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -206,7 +206,7 @@ void AssignmentClient::sendAssignmentRequest() { } } -void AssignmentClient::handleCreateAssignementPacket(QSharedPointer packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr) { +void AssignmentClient::handleCreateAssignmentPacket(QSharedPointer packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr) { qDebug() << "Received a PacketType::CreateAssignment - attempting to unpack."; // construct the deployed assignment from the packet data @@ -215,6 +215,8 @@ void AssignmentClient::handleCreateAssignementPacket(QSharedPointer pa if (_currentAssignment) { qDebug() << "Received an assignment -" << *_currentAssignment; + auto nodeList = DependencyManager::get(); + // switch our DomainHandler hostname and port to whoever sent us the assignment nodeList->getDomainHandler().setSockAddr(senderSockAddr, _assignmentServerHostname); @@ -305,9 +307,6 @@ void AssignmentClient::assignmentCompleted() { auto nodeList = DependencyManager::get(); - // have us handle incoming NodeList datagrams again, and make sure our ThreadedAssignment isn't handling them - connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &AssignmentClient::readPendingDatagrams); - // reset our NodeList by switching back to unassigned and clearing the list nodeList->setOwnerType(NodeType::Unassigned); nodeList->reset(); diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h index ba0a2e096e..268683fa3c 100644 --- a/assignment-client/src/AssignmentClient.h +++ b/assignment-client/src/AssignmentClient.h @@ -37,7 +37,7 @@ public slots: void aboutToQuit(); private slots: - void handleCreateAssignementPacket(QSharedPointer packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr); + void handleCreateAssignmentPacket(QSharedPointer packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr); void handleStopNodePacket(QSharedPointer packet, SharedNodePointer senderNode, HifiSockAddr senderSockAddr); private: