# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1146731745 -7200
# Node ID dd865cc57aa2c599fba66ab5fe1b1f3f0b690adf
# Parent  80434fde7cfa1bb0296c54a0dfd2c8459bcf35a5
Fix joining a room when the buddylist is empty


diff -r 80434fde7cfa -r dd865cc57aa2 mcabber/src/commands.c
--- a/mcabber/src/commands.c	Wed May 03 11:28:41 2006 +0200
+++ b/mcabber/src/commands.c	Thu May 04 10:35:45 2006 +0200
@@ -1862,9 +1862,6 @@
     return;
   }
 
-  if (!current_buddy) return;
-  bud = BUDDATA(current_buddy);
-
   paramlst = split_arg(arg, 2, 1); // subcmd, arg
   subcmd = *paramlst;
   arg = *(paramlst+1);
@@ -1875,6 +1872,16 @@
     return;
   }
 
+  if (current_buddy) {
+    bud = BUDDATA(current_buddy);
+  } else {
+    if (strcasecmp(subcmd, "join"))
+      return;
+    // "room join" is a special case, we don't need to have a valid
+    // current_buddy.
+    bud = NULL;
+  }
+
   if (!strcasecmp(subcmd, "join"))  {
     if ((arg = check_room_subcommand(arg, TRUE, NULL)) != NULL)
       room_join(bud, arg);