Merge pull request #13192 from druiz17/fix-spaming-set-host

fix case sensitive comparison in AddressManager::setHost
This commit is contained in:
John Conklin II 2018-05-21 11:16:18 -07:00 committed by GitHub
commit 168edb1cde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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()) {
bool hostHasChanged = QString::compare(host, _domainURL.host(), Qt::CaseInsensitive);
if (hostHasChanged || 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 (hostHasChanged) {
emit hostChanged(host);
}