Changeset 174:dd14884590d5 in qutecom-coip

Timestamp:

Mar 27, 2010 7:19:37 PM (3 years ago)

Author:

laurent

Branch:

default

Message:

prevent crash on quit

File:

• libs/coipmanager/plugins/connectmanager/libpurple/PurpleConnectedState.cpp (modified) (1 diff)

libs/coipmanager/plugins/connectmanager/libpurple/PurpleConnectedState.cpp

@@ -55 +55 @@
 
 bool PurpleConnectedState::disconnectCbk(void * data) {
-        QMutexLocker lock(_mutex);
+        if(_mutex)
+        {
+                QMutexLocker lock(_mutex);
 
-        Account * account = ((misc_t *)data)->account;
-        PurpleAccount *pAccount = purple_accounts_find(PurpleWrapper::purpleLogin(account).c_str(),
+                Account * account = ((misc_t *)data)->account;
+                PurpleAccount *pAccount = purple_accounts_find(PurpleWrapper::purpleLogin(account).c_str(),
                 PurpleIMPrcl::getPrclId(account->getAccountType()));
 
-        if (!pAccount) {
-                LOG_ERROR("Account not in LibPurple database");
-                return FALSE;
+                if (!pAccount) {
+                        LOG_ERROR("Account not in LibPurple database");
+                        return FALSE;
+                }
+
+                if (purple_account_get_enabled(pAccount, purple_core_get_ui())) {
+                        purple_account_set_enabled(pAccount, purple_core_get_ui(), FALSE);
+                }
+
+                purple_account_disconnect(pAccount);
+
+                purple_timeout_remove(((misc_t *)data)->cbk_id);
+                free((misc_t *)data);
         }
-
-        if (purple_account_get_enabled(pAccount, purple_core_get_ui())) {
-                purple_account_set_enabled(pAccount, purple_core_get_ui(), FALSE);
-        }
-
-        purple_account_disconnect(pAccount);
-
-        purple_timeout_remove(((misc_t *)data)->cbk_id);
-        free((misc_t *)data);
 
         return TRUE;