aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chatroom.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chatroom.c b/libempathy/empathy-tp-chatroom.c
index 60e0dd7cd..13b43ba37 100644
--- a/libempathy/empathy-tp-chatroom.c
+++ b/libempathy/empathy-tp-chatroom.c
@@ -183,10 +183,10 @@ empathy_tp_chatroom_get_invitation (EmpathyTpChatroom *chatroom,
priv = GET_PRIV (chatroom);
- if (*contact) {
+ if (contact) {
*contact = priv->invitor;
}
- if (*message) {
+ if (message) {
*message = priv->invit_message;
}
@@ -203,6 +203,10 @@ empathy_tp_chatroom_accept_invitation (EmpathyTpChatroom *chatroom)
priv = GET_PRIV (chatroom);
+ if (!priv->is_invited) {
+ return;
+ }
+
/* Clear invitation data */
priv->is_invited = FALSE;
if (priv->invitor) {