Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5181 from birarda/master

Browse source 
fix for double store on index path lookup
This commit is contained in:
Brad Davis 2015-06-22 13:58:36 -07:00
commit 98f7b0a689
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/networking/src/AddressManager.cpp
View file

@ -308,6 +308,9 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
handlePath(returnedPath, trigger); handlePath(returnedPath, trigger);
} }
} else { } else {
// we're going to hit the index path, set that as the _newHostLookupPath
_newHostLookupPath = INDEX_PATH;
// we didn't override the path or get one back - ask the DS for the viewpoint of its index path // we didn't override the path or get one back - ask the DS for the viewpoint of its index path
// which we will jump to if it exists // which we will jump to if it exists
emit pathChangeRequired(INDEX_PATH); emit pathChangeRequired(INDEX_PATH);
@ -479,6 +482,7 @@ bool AddressManager::handleViewpoint(const QString& viewpointString, bool should
// We use _newHostLookupPath to determine if the client has already stored its last address // We use _newHostLookupPath to determine if the client has already stored its last address
// before moving to a new host thanks to the information in the same lookup URL. // before moving to a new host thanks to the information in the same lookup URL.
if (definitelyPathOnly || (!pathString.isEmpty() && pathString != _newHostLookupPath)) { if (definitelyPathOnly || (!pathString.isEmpty() && pathString != _newHostLookupPath)) {
addCurrentAddressToHistory(LookupTrigger::UserInput); addCurrentAddressToHistory(LookupTrigger::UserInput);
} }