From 5d51a283bb4c585f068a580eec96cf316e35f062 Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 5 Feb 2019 22:26:57 +0000 Subject: [PATCH] Actually check that we don't have CAPs that we're waiting on a ACK/NAK for before ending CAP negotiation (line_handler.py) --- modules/line_handler.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/line_handler.py b/modules/line_handler.py index 7a692bd1..4c112d21 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -320,7 +320,9 @@ class Module(ModuleManager.BaseModule): if subcommand == "ack" or subcommand == "nak": for capability in capabilities: event["server"].requested_capabilities.remove(capability) + if (event["server"].cap_started and + not event["server"].requested_capabilities and not event["server"].waiting_for_capabilities()): event["server"].cap_started = False event["server"].send_capability_end()