Merge branch 'fix_recursive_resolve' into 'master'

Fix recursive resolve

See merge request mer-core/libcontacts!6

src/seasidecache.cpp

@@ -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()) {
@@ -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);
 }