Changeset 13857c6

Timestamp:

2008-01-13T17:13:45Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

52744f8

Parents:

dded27d

Message:

Fixed handing of failed groupchat joins.

File:

• protocols/jabber/conference.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -73 +73 @@
         
         room = xt_find_attr( orig, "to" );
-        if( ( bud = jabber_buddy_by_jid( ic, room, 0 ) ) )
-                jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
-        
+        bud = jabber_buddy_by_jid( ic, room, 0 );
         err = jabber_error_parse( xt_find_node( node->children, "error" ), XMLNS_STANZA_ERROR );
         if( err )
         {
-                imcb_error( ic, "Error joining groupchat %s: %s%s%s",
-                            bud->bare_jid, err->code, err->text ? ": " : "",
-                            err->text ? err->text : "" );
+                imcb_error( ic, "Error joining groupchat %s: %s%s%s", room, err->code,
+                            err->text ? ": " : "", err->text ? err->text : "" );
                 jabber_error_free( err );
         }
+        if( bud )
+                jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
         
         return XT_HANDLED;