From 450a9c03a7e167659ad70fd67df674d29b655cfa Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 18 Mar 2014 23:54:23 -0700 Subject: [PATCH] revert changes --- assignment-client/src/AssignmentClient.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index e4db44eea4..970b6518ec 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -194,8 +194,6 @@ void AssignmentClient::handleAuthenticationRequest() { } void AssignmentClient::assignmentCompleted() { -qDebug() << "START AssignmentClient::assignmentCompleted()... this=" << this << "_currentAssignment=" << _currentAssignment; - // reset the logging target to the the CHILD_TARGET_NAME Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME); @@ -203,15 +201,14 @@ qDebug() << "START AssignmentClient::assignmentCompleted()... this=" << this << NodeList* nodeList = NodeList::getInstance(); - // reset our NodeList by switching back to unassigned and clearing the list - nodeList->reset(); - nodeList->setOwnerType(NodeType::Unassigned); - nodeList->resetNodeInterestSet(); - // have us handle incoming NodeList datagrams again disconnect(&nodeList->getNodeSocket(), 0, _currentAssignment, 0); connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &AssignmentClient::readPendingDatagrams); -qDebug() << "DONE AssignmentClient::assignmentCompleted()... this=" << this << "_currentAssignment was=" << _currentAssignment; _currentAssignment = NULL; + + // reset our NodeList by switching back to unassigned and clearing the list + nodeList->setOwnerType(NodeType::Unassigned); + nodeList->reset(); + nodeList->resetNodeInterestSet(); }