Fixe rejoining room after nickname conflict

fixes #241
2013-09-22 01:26:40 +01:00
parent d0c8ed462d
commit d70245c887
3 changed files with 14 additions and 5 deletions
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -320,10 +320,12 @@ presence_leave_chat_room(const char * const room_jid)
    xmpp_conn_t *conn = connection_get_conn();
    char *nick = muc_get_room_nick(room_jid);

-    xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid,
-        nick);
-    xmpp_send(conn, presence);
-    xmpp_stanza_release(presence);
+    if (nick != NULL) {
+        xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid,
+            nick);
+        xmpp_send(conn, presence);
+        xmpp_stanza_release(presence);
+    }
 }

 static int