summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/completion.c8
-rw-r--r--src/irc/irc-commands.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/src/common/completion.c b/src/common/completion.c
index 46ccdb7f8..ae1554677 100644
--- a/src/common/completion.c
+++ b/src/common/completion.c
@@ -671,11 +671,9 @@ completion_list_add_topic (t_completion *completion)
{
char *string;
- if (!completion->server || !completion->channel
- || !((t_irc_channel *)(completion->channel))->topic
- || !((t_irc_channel *)(completion->channel))->topic[0])
- completion_stop (completion);
- else
+ if (completion->server && completion->channel
+ && ((t_irc_channel *)(completion->channel))->topic
+ && ((t_irc_channel *)(completion->channel))->topic[0])
{
if (cfg_irc_colors_send)
string = (char *)gui_color_decode_for_user_entry ((unsigned char *)((t_irc_channel *)(completion->channel))->topic);
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index 30ad1e83c..51e9e542a 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -258,7 +258,7 @@ t_irc_command irc_commands[] =
N_("[channel] [topic]"),
N_("channel: channel name\ntopic: new topic for channel "
"(if topic is \"-delete\" then topic is deleted)"),
- "%t|-delete", 0, MAX_ARGS, 1, 1, NULL, irc_cmd_send_topic, irc_cmd_recv_topic },
+ "%t|-delete %-", 0, MAX_ARGS, 1, 1, NULL, irc_cmd_send_topic, irc_cmd_recv_topic },
{ "trace", N_("find the route to specific server"),
N_("[target]"),
N_("target: server"),