From 9061e33a1f8746d06732bcf3cca26bfe94350254 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 21 Jan 2016 18:22:51 -0800 Subject: [PATCH] send path query once connected to domain --- domain-server/src/DomainServer.cpp | 4 +--- libraries/networking/src/NodeList.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 31ecd8a257..f0ffd8ff73 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1878,15 +1878,13 @@ void DomainServer::processPathQueryPacket(QSharedPointer messag auto keypath = QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(SETTINGS_PATHS_KEY).arg(pathQuery); const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(), keypath); - // if we didn't match the path BUT this is for the index path then send back our default - - if (pathMatch || pathQuery == INDEX_PATH) { // we got a match, respond with the resulting viewpoint auto nodeList = DependencyManager::get(); QString responseViewpoint; + // if we didn't match the path BUT this is for the index path then send back our default if (pathMatch) { responseViewpoint = pathMatch->toMap()[PATH_VIEWPOINT_KEY].toString(); } else { diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 7870e61723..b0cd8cce39 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -60,7 +60,7 @@ NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned // in case we don't know how to talk to DS when a path change is requested // fire off any pending DS path query when we get socket information - connect(&_domainHandler, &DomainHandler::completedSocketDiscovery, this, &NodeList::sendPendingDSPathQuery); + connect(&_domainHandler, &DomainHandler::connectedToDomain, this, &NodeList::sendPendingDSPathQuery); // send a domain server check in immediately once the DS socket is known connect(&_domainHandler, &DomainHandler::completedSocketDiscovery, this, &NodeList::sendDomainServerCheckIn);