diff options
| author | Valentin Batz <senneth@irssi.org> | 2004-10-16 00:08:21 +0000 |
|---|---|---|
| committer | senneth <senneth@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2004-10-16 00:08:21 +0000 |
| commit | 1d834b39b3e1ea7a327c786c869025478d65b96e (patch) | |
| tree | 1307fc67c6960b9f5d5700e44d89170b76ce74fc /src/fe-common | |
| parent | 5a7e889f4f12fa395f4338a0f300a54f05212cf3 (diff) | |
| download | irssi-1d834b39b3e1ea7a327c786c869025478d65b96e.zip | |
Fixed /join -invite -window bug if there is no invite
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3320 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/fe-channels.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c index 78ffa2b1..5b531c2e 100644 --- a/src/fe-common/core/fe-channels.c +++ b/src/fe-common/core/fe-channels.c @@ -110,7 +110,7 @@ static void sig_channel_joined(CHANNEL_REC *channel) fe_channels_nicklist(channel, CHANNEL_NICKLIST_FLAG_ALL); } -static void cmd_wjoin_pre(const char *data) +static void cmd_wjoin_pre(const char *data, SERVER_REC *server) { GHashTable *optlist; char *nick; @@ -121,6 +121,12 @@ static void cmd_wjoin_pre(const char *data) "join", &optlist, &nick)) return; + /* kludge for /join -invite -window if there is no invite */ + if (g_hash_table_lookup(optlist, "invite") && + server != NULL && server->last_invite == NULL) { + cmd_params_free(free_arg); + return; + } if (g_hash_table_lookup(optlist, "window") != NULL) { signal_add("channel created", (SIGNAL_FUNC) signal_channel_created_curwin); |