Rename show_channel_sync() to channel_sync(), and don't use prepare_command() before it.
prepare_command() does nothing useful here, and it sets the current server to an incorrect value if the channel sync happens while the current window is set to a window from a different server. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@514 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
[Changes 1.2c01]
|
[Changes 1.2c01]
|
||||||
|
|
||||||
|
* Correctly handle channel sync across multi-server. (caf)
|
||||||
|
|
||||||
* Fixes and improvements for channel logging. (caf)
|
* Fixes and improvements for channel logging. (caf)
|
||||||
|
|
||||||
* Use correct (MODECHAN and MODEUSER) display level for channel and user
|
* Use correct (MODECHAN and MODEUSER) display level for channel and user
|
||||||
|
|||||||
@@ -1845,7 +1845,7 @@ int in_join_list(char *chan, int server)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void show_channel_sync(struct joinlist *tmp, char *chan)
|
void channel_sync(struct joinlist *tmp, char *chan)
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
get_time(&tv);
|
get_time(&tv);
|
||||||
@@ -1881,8 +1881,7 @@ int got_info(char *chan, int server, int type)
|
|||||||
|
|
||||||
if ((tmp->gotinfo |= type) == what_info)
|
if ((tmp->gotinfo |= type) == what_info)
|
||||||
{
|
{
|
||||||
if (prepare_command(&tmp->server, chan, PC_SILENT))
|
channel_sync(tmp, chan);
|
||||||
show_channel_sync(tmp, chan);
|
|
||||||
remove_from_join_list(chan, tmp->server);
|
remove_from_join_list(chan, tmp->server);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user