Merge remote branch 'wjt/new-account-removed'

Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>

1 files changed, 5 insertions, 4 deletions

diff --git a/qt4/TelepathyQt4/account-set.cpp b/qt4/TelepathyQt4/account-set.cpp
index 806da00ca..aa8163f49 100644
--- a/qt4/TelepathyQt4/account-set.cpp
+++ b/qt4/TelepathyQt4/account-set.cpp
@@ -122,10 +122,11 @@ void AccountSet::Private::filterAccount(const AccountPtr &account)
             }
         }
     } else {
-        /* QHash::remove is no-op if the item is not in the hash */
-        accounts.remove(account->objectPath());
-        if (ready) {
-            emit parent->accountRemoved(account);
+        if (accounts.contains(account->objectPath())) {
+            accounts.remove(account->objectPath());
+            if (ready) {
+                emit parent->accountRemoved(account);
+            }
         }
     }
 }