diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c156de03ca..ecc36d7f05 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -306,6 +306,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : // use our MyAvatar position and quat for address manager path addressManager->setPositionGetter(getPositionForPath); addressManager->setOrientationGetter(getOrientationForPath); + + connect(addressManager.data(), &AddressManager::rootPlaceNameChanged, this, &Application::updateWindowTitle); _settings = new QSettings(this); _numChangedSettings = 0; diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 8ca0226a34..4802f3ca15 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -181,8 +181,6 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject) { locationMap = dataObject[DATA_OBJECT_USER_LOCATION_KEY].toMap(); } - qDebug() << locationMap; - if (!locationMap.isEmpty()) { const QString LOCATION_API_ROOT_KEY = "root"; const QString LOCATION_API_DOMAIN_KEY = "domain"; @@ -222,7 +220,8 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject) { // set our current root place name to the name that came back const QString PLACE_NAME_KEY = "name"; - _rootPlaceName = rootMap[PLACE_NAME_KEY].toString(); + QString newRootPlaceName = rootMap[PLACE_NAME_KEY].toString(); + setRootPlaceName(newRootPlaceName); // take the path that came back const QString PLACE_PATH_KEY = "path"; @@ -384,6 +383,13 @@ bool AddressManager::handleUsername(const QString& lookupString) { return false; } +void AddressManager::setRootPlaceName(const QString& rootPlaceName) { + if (rootPlaceName != _rootPlaceName) { + _rootPlaceName = rootPlaceName; + emit rootPlaceNameChanged(_rootPlaceName); + } +} + void AddressManager::setDomainInfo(const QString& hostname, quint16 port) { _rootPlaceName = hostname; diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index a8adf57741..6cb5cdbf60 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -43,7 +43,9 @@ public: const QString currentPath(bool withOrientation = true) const; const QUuid& getRootPlaceID() const { return _rootPlaceID; } + const QString& getRootPlaceName() const { return _rootPlaceName; } + void setRootPlaceName(const QString& rootPlaceName); void attemptPlaceNameLookup(const QString& lookupString); @@ -68,6 +70,7 @@ signals: void locationChangeRequired(const glm::vec3& newPosition, bool hasOrientationChange, const glm::quat& newOrientation, bool shouldFaceLocation); + void rootPlaceNameChanged(const QString& newRootPlaceName); protected: AddressManager(); private slots: