mirror of
https://github.com/irssi/irssi.git
synced 2024-11-03 04:27:19 -05:00
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
This commit is contained in:
parent
5a7e889f4f
commit
1d834b39b3
@ -110,7 +110,7 @@ static void sig_channel_joined(CHANNEL_REC *channel)
|
|||||||
fe_channels_nicklist(channel, CHANNEL_NICKLIST_FLAG_ALL);
|
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;
|
GHashTable *optlist;
|
||||||
char *nick;
|
char *nick;
|
||||||
@ -121,6 +121,12 @@ static void cmd_wjoin_pre(const char *data)
|
|||||||
"join", &optlist, &nick))
|
"join", &optlist, &nick))
|
||||||
return;
|
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) {
|
if (g_hash_table_lookup(optlist, "window") != NULL) {
|
||||||
signal_add("channel created",
|
signal_add("channel created",
|
||||||
(SIGNAL_FUNC) signal_channel_created_curwin);
|
(SIGNAL_FUNC) signal_channel_created_curwin);
|
||||||
|
Loading…
Reference in New Issue
Block a user