Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'fix_recursive_resolve' into 'master'
Fix recursive resolve

See merge request mer-core/libcontacts!6
  • Loading branch information
pvuorela committed Aug 31, 2018
2 parents 96361fd + 1b8bbe3 commit 7a6dfca
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/seasidecache.cpp
Expand Up @@ -1946,12 +1946,10 @@ bool SeasideCache::event(QEvent *event)
bool idleProcessing = false;
startRequest(&idleProcessing);

if (!m_unknownResolveAddresses.isEmpty()) {
// Report any unknown addresses
while (!m_unknownResolveAddresses.isEmpty()) {
const ResolveData &resolve = m_unknownResolveAddresses.takeFirst();
resolve.listener->addressResolved(resolve.first, resolve.second, 0);
}
// Report any unknown addresses
while (!m_unknownResolveAddresses.isEmpty()) {
const ResolveData &resolve = m_unknownResolveAddresses.takeFirst();
resolve.listener->addressResolved(resolve.first, resolve.second, 0);
}

if (!m_contactsToAppend.isEmpty() || !m_contactsToUpdate.isEmpty()) {
Expand Down Expand Up @@ -2909,9 +2907,9 @@ void SeasideCache::addressRequestStateChanged(QContactAbstractRequest::State sta

m_unknownAddresses.append(data);
}
m_pendingResolve.remove(data);
data.listener->addressResolved(data.first, data.second, item);
delete it.key();
m_pendingResolve.remove(data);
m_resolveAddresses.erase(it);
}

Expand Down

0 comments on commit 7a6dfca

Please sign in to comment.