diff options
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 83faaff39..79136156a 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -777,10 +777,15 @@ tp_chat_check_if_ready (EmpathyTpChat *chat) { EmpathyTpChatPriv *priv = GET_PRIV (chat); - if (priv->ready || priv->user == NULL || - (priv->members == NULL && priv->remote_contact == NULL)) { + if (priv->ready) + return; + + if (priv->user == NULL) + return; + + /* We need either the members (room) or the remote contact (private chat) */ + if (priv->members == NULL && priv->remote_contact == NULL) return; - } DEBUG ("Ready!"); |