diff options
| -rw-r--r-- | src/channels.c | 8 | ||||
| -rw-r--r-- | version.log | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/channels.c b/src/channels.c index 4a8a77bca..eca6c25bf 100644 --- a/src/channels.c +++ b/src/channels.c @@ -841,7 +841,8 @@ void do_sjoin(const char *source, int ac, char **av) cumodes, 1); } - if (c->ci && (!serv || is_sync(serv))) + if (c->ci && (!serv || is_sync(serv)) + && !c->topic_sync) restore_topic(c->name); chan_set_correct_modes(user, c); } @@ -916,8 +917,6 @@ void do_sjoin(const char *source, int ac, char **av) cumodes, 1); } - if (c->ci && (!serv || is_sync(serv))) - restore_topic(c->name); chan_set_correct_modes(user, c); } } @@ -989,8 +988,6 @@ void do_sjoin(const char *source, int ac, char **av) cumodes, 1); } - if (c->ci && (!serv || is_sync(serv))) - restore_topic(c->name); chan_set_correct_modes(user, c); } } @@ -1403,6 +1400,7 @@ Channel *chan_create(char *chan) stick_all(c->ci); c->topic_sync = 0; } else { + restore_topic(chan); c->topic_sync = 1; } diff --git a/version.log b/version.log index bd08aabe2..77c7e442a 100644 --- a/version.log +++ b/version.log @@ -8,10 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="8" -VERSION_BUILD="638" +VERSION_BUILD="639" # $Log$ # +# BUILD : 1.7.8 (639) +# BUGS : +# NOTES : Some more fixing of the topic stuff to get it to work better with UnrealIRCd +# # BUILD : 1.7.8 (638) # BUGS : # NOTES : Accidently left 2 lines too much while fixing the topics being re-set on sync, causing them to be re-set on every normal join sent via SJOIN |