diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-01-02 14:44:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 14:44:07 +0100 |
| commit | 91f48c6f0e03e53c0968a5433d672ea966006e59 (patch) | |
| tree | 70d13fe291401df18825b1f91ccb6ba3fe1066da /src/fe-common | |
| parent | 29ad8baedcf79a9ab50c2d118750969031a35042 (diff) | |
| parent | 0d6add02cf1a1e0dc3905a482d259a8851b4939c (diff) | |
| download | irssi-91f48c6f0e03e53c0968a5433d672ea966006e59.zip | |
Merge pull request #586 from LemonBoy/fix-580
Process the nick changes in queries before the PRIVMSG is handled.
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/irc/fe-irc-queries.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/fe-common/irc/fe-irc-queries.c b/src/fe-common/irc/fe-irc-queries.c index b2faefbc..c928a94a 100644 --- a/src/fe-common/irc/fe-irc-queries.c +++ b/src/fe-common/irc/fe-irc-queries.c @@ -78,6 +78,13 @@ static void event_privmsg(SERVER_REC *server, const char *data, if (!server_has_nick(server, query->name)) query_change_nick(query, nick); } + } else { + /* process the changes to the query structure now, before the + * privmsg is dispatched. */ + if (g_strcmp0(query->name, nick) != 0) + query_change_nick(query, nick); + if (address != NULL && g_strcmp0(query->address, address) != 0) + query_change_address(query, address); } } |