summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-10-14 00:45:16 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-10-14 00:45:16 +0000
commit6a3efe49ab7b41062650da894eccc2d4be0b8f45 (patch)
treee60a8f2eaaef04f87d9c8752f2742acc4f5e41bb /src/core
parentf850204479e84c3112b6353da48a5a1ec81bb1fe (diff)
downloadirssi-6a3efe49ab7b41062650da894eccc2d4be0b8f45.zip
Autorejoin when join temporarily fails because of netsplit is handled
better now. Irssi prints a nice message about it only once and you can abort it with /RMREJOINS command. "channel query" -> "channel joined" channels_join() must not use cmd_return|param_error() commands since we don't necessarily call it from command handler and signal_stop() could cause some damage. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@739 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
-rw-r--r--src/core/chat-commands.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 58b83f7c..f2cae1ab 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -46,6 +46,9 @@ static void cmd_join(const char *data, SERVER_REC *server)
if (g_hash_table_lookup(optlist, "invite"))
channels = server->last_invite;
else {
+ if (*channels == '\0')
+ cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
+
/* -<server tag> */
server = cmd_options_get_server("join", optlist, server);
}