Chat room windows now created only after successful join

2014-04-21 00:37:04 +01:00
parent 9a55d8ad19
commit 2c15aba92a
17 changed files with 89 additions and 102 deletions
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1591,9 +1591,10 @@ cmd_join(gchar **args, struct cmd_help_t help)

    if (!muc_room_is_active(room)) {
        presence_join_room(room, nick, passwd);
+        muc_join_room(room, nick, passwd, FALSE);
+    } else if (muc_get_roster_received(room)) {
+        ui_room_join(room, TRUE);
    }
-    ui_room_join(room, TRUE);
-    muc_remove_invite(room);

    jid_destroy(room_arg);
    g_string_free(room_str, TRUE);