From 48404d811c0dbc57626c44e7feb1756fa8b9bef7 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 17 May 2018 16:34:52 -0700 Subject: [PATCH 1/2] fix case sensitive comparison --- libraries/networking/src/AddressManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index dd6a7fffe9..5f64e20d35 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -767,10 +767,10 @@ bool AddressManager::handleUsername(const QString& lookupString) { } bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 port) { - if (host != _domainURL.host() || port != _domainURL.port()) { + int hostComparisonResult = QString::compare(host, _domainURL.host(), Qt::CaseInsensitive); + if (hostComparisonResult != 0 || port != _domainURL.port()) { addCurrentAddressToHistory(trigger); - bool emitHostChanged = host != _domainURL.host(); _domainURL = QUrl(); _domainURL.setScheme(URL_SCHEME_HIFI); _domainURL.setHost(host); @@ -781,7 +781,7 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 // any host change should clear the shareable place name _shareablePlaceName.clear(); - if (emitHostChanged) { + if (hostComparisonResult != 0) { emit hostChanged(host); } From 027d1ed50ba24eec9152e513c0fa0643b59e4670 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 18 May 2018 11:07:11 -0700 Subject: [PATCH 2/2] making requested changes --- libraries/networking/src/AddressManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 5f64e20d35..977cabb57a 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -767,8 +767,8 @@ bool AddressManager::handleUsername(const QString& lookupString) { } bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 port) { - int hostComparisonResult = QString::compare(host, _domainURL.host(), Qt::CaseInsensitive); - if (hostComparisonResult != 0 || port != _domainURL.port()) { + bool hostHasChanged = QString::compare(host, _domainURL.host(), Qt::CaseInsensitive); + if (hostHasChanged || port != _domainURL.port()) { addCurrentAddressToHistory(trigger); _domainURL = QUrl(); @@ -781,7 +781,7 @@ bool AddressManager::setHost(const QString& host, LookupTrigger trigger, quint16 // any host change should clear the shareable place name _shareablePlaceName.clear(); - if (hostComparisonResult != 0) { + if (hostHasChanged) { emit hostChanged(host); }