summaryrefslogtreecommitdiff
path: root/src/irc/core/irc.c
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2001-11-11 20:20:43 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2001-11-11 20:20:43 +0000
commit5e1993346e1ff99e41cd7b7c3290cdc065d297ff (patch)
tree4686fa4a76f9345ca97ebffde3a1b59dc0c22e75 /src/irc/core/irc.c
parent24d51a694b1bca50f60048f90e44f9dbcb03428c (diff)
downloadirssi-5e1993346e1ff99e41cd7b7c3290cdc065d297ff.zip
Redirection fixes.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1983 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/irc.c')
-rw-r--r--src/irc/core/irc.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 8b967d4e..b3ab9897 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -64,7 +64,8 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
if (send_now) {
rawlog_output(server->rawlog, cmd);
- server_redirect_command(server, cmd);
+ server_redirect_command(server, cmd, server->redirect_next);
+ server->redirect_next = NULL;
}
if (!raw) {
@@ -87,9 +88,18 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd,
}
/* add to queue */
- server->cmdqueue = immediate ?
- g_slist_prepend(server->cmdqueue, g_strdup(cmd)) :
- g_slist_append(server->cmdqueue, g_strdup(cmd));
+ if (immediate) {
+ server->cmdqueue = g_slist_prepend(server->cmdqueue,
+ server->redirect_next);
+ server->cmdqueue = g_slist_prepend(server->cmdqueue,
+ g_strdup(cmd));
+ } else {
+ server->cmdqueue = g_slist_append(server->cmdqueue,
+ g_strdup(cmd));
+ server->cmdqueue = g_slist_append(server->cmdqueue,
+ server->redirect_next);
+ }
+ server->redirect_next = NULL;
}
/* Send command to IRC server */