Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12914 from sethalves/rc66-fix-bookmarks

Browse source 
fix bookmarks, don't put :0 in urls
This commit is contained in:
John Conklin II 2018-04-17 08:29:36 -07:00 committed by GitHub
commit 44e0a2acc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -439,7 +439,9 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const
QUrl domainURL;
domainURL.setScheme(URL_SCHEME_HIFI);
domainURL.setHost(domainHostname);
domainURL.setPort(domainPort);
if (domainPort > 0) {
domainURL.setPort(domainPort);
}
emit possibleDomainChangeRequired(domainURL, domainID);
} else {
QString iceServerAddress = domainObject[DOMAIN_ICE_SERVER_ADDRESS_KEY].toString();
@ -610,7 +612,9 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri
QUrl domainURL;
domainURL.setScheme(URL_SCHEME_HIFI);
domainURL.setHost(domainIPString);
domainURL.setPort(domainPort);
if (domainPort > 0) {
domainURL.setPort(domainPort);
}
hostChanged = setDomainInfo(domainURL, trigger);
return true;
@ -631,7 +635,9 @@ bool AddressManager::handleNetworkAddress(const QString& lookupString, LookupTri
QUrl domainURL;
domainURL.setScheme(URL_SCHEME_HIFI);
domainURL.setHost(domainHostname);
domainURL.setPort(domainPort);
if (domainPort > 0) {
domainURL.setPort(domainPort);
}
hostChanged = setDomainInfo(domainURL, trigger);
return true;
@ -763,7 +769,9 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16
_domainURL = QUrl();
_domainURL.setScheme(URL_SCHEME_HIFI);
_domainURL.setHost(host);
_domainURL.setPort(port);
if (port > 0) {
_domainURL.setPort(port);
}
// any host change should clear the shareable place name
_shareablePlaceName.clear();