aboutsummaryrefslogtreecommitdiffstats
path: root/root_commands.c
diff options
context:
space:
mode:
authorSven Moritz Hallberg <pesco@khjk.org>2010-06-03 12:31:46 +0200
committerSven Moritz Hallberg <pesco@khjk.org>2010-06-03 12:31:46 +0200
commit3f81999c20852f14a5fb27a6ef6c5ea44db61a4d (patch)
tree14fa6a79d444049e758be853277270117e11692b /root_commands.c
parentfc34fb5d0b717d90edfc7ed78f11166eb23c536e (diff)
parent2e44b1f12fb58a6969a8fbaf2946d6ecdace484a (diff)
merge in bitlbee 1.2.4
Diffstat (limited to 'root_commands.c')
-rw-r--r--root_commands.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/root_commands.c b/root_commands.c
index 37dcf203..316de60a 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -309,7 +309,7 @@ static int cmd_set_real( irc_t *irc, char **cmd, cmd_set_findhead findhead, cmd_
set_t *s = set_find( head, set_name );
int st;
- if( checkflags && checkflags( irc, s ) == 0 )
+ if( s && checkflags && checkflags( irc, s ) == 0 )
return 0;
if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
@@ -1078,6 +1078,8 @@ static void cmd_chat( irc_t *irc, char **cmd )
}
else if( g_strcasecmp( cmd[1], "set" ) == 0 )
{
+ MIN_ARGS( 2 );
+
cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead, NULL );
}
else if( g_strcasecmp( cmd[1], "del" ) == 0 )