summaryrefslogtreecommitdiff
path: root/src/irc/core/channels-query.c
diff options
context:
space:
mode:
authorWouter Coekaerts <coekie@irssi.org>2006-08-20 13:40:03 +0000
committercoekie <coekie@dbcabf3a-b0e7-0310-adc4-f8d773084564>2006-08-20 13:40:03 +0000
commit59f91046c195887deda721191d5070b3a29173cf (patch)
tree36159167384c4a3ea4ab7107856eb80093a77dd2 /src/irc/core/channels-query.c
parentdee4238e9b4d2d28f243d41628a66e53de4010bb (diff)
downloadirssi-59f91046c195887deda721191d5070b3a29173cf.zip
don't wait for all /names replies before syncing if we can't combine queries anyways. Patch by jilles
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4321 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/channels-query.c')
-rw-r--r--src/irc/core/channels-query.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 0274a71a..484c3fcf 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -274,8 +274,10 @@ static void query_check(IRC_SERVER_REC *server)
if (rec->current_queries != NULL)
return; /* old queries haven't been answered yet */
- if (!channels_have_all_names(server)) {
+ if (server->max_query_chans > 1 && !server->no_multi_who && !server->no_multi_mode && !channels_have_all_names(server)) {
/* all channels haven't sent /NAMES list yet */
+ /* only do this if there would be a benefit in combining
+ * queries -- jilles */
return;
}