forked from PsychoticNinja/irssi
Irssi didn't properly abort a redirection of which end event it missed.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2152 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
e246ca668b
commit
53bdd8f602
@ -336,6 +336,9 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
|
|||||||
const char *signal;
|
const char *signal;
|
||||||
int stop_signal;
|
int stop_signal;
|
||||||
|
|
||||||
|
if (redirect->aborted)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
/* get the signal for redirection event - if it's not found we'll
|
/* get the signal for redirection event - if it's not found we'll
|
||||||
use the default signal */
|
use the default signal */
|
||||||
signal = NULL;
|
signal = NULL;
|
||||||
@ -475,8 +478,11 @@ server_redirect_get(IRC_SERVER_REC *server, const char *event,
|
|||||||
} else {
|
} else {
|
||||||
/* not a numeric, so we've lost the
|
/* not a numeric, so we've lost the
|
||||||
stop event.. */
|
stop event.. */
|
||||||
(*redirect)->destroyed = TRUE;
|
|
||||||
(*redirect)->aborted = TRUE;
|
(*redirect)->aborted = TRUE;
|
||||||
|
redirect_abort(server, *redirect);
|
||||||
|
|
||||||
|
*redirect = NULL;
|
||||||
|
signal = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user