From 00eb18bae8cf62d49f4b5d42aed8507fcca3c03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sun, 23 Oct 2016 23:58:03 +0200 Subject: Refactor channel->parting to a new location --- src/bridge/bridge.cpp | 5 +---- src/irc/irc_client.cpp | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp index 9300d45..ac69ebc 100644 --- a/src/bridge/bridge.cpp +++ b/src/bridge/bridge.cpp @@ -365,10 +365,7 @@ void Bridge::leave_irc_channel(Iid&& iid, const std::string& status_message, con // acknowledgment from the server IrcChannel* channel = irc->get_channel(iid.get_local()); if (channel->joined && !channel->parting) - { - irc->send_part_command(iid.get_local(), status_message); - channel->parting = true; - } + irc->send_part_command(iid.get_local(), status_message); // Since there are no resources left in that channel, we don't // want to receive private messages using this room's JID this->remove_all_preferred_from_jid_of_room(iid.get_local()); diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp index c301af0..9877806 100644 --- a/src/irc/irc_client.cpp +++ b/src/irc/irc_client.cpp @@ -502,6 +502,7 @@ void IrcClient::send_part_command(const std::string& chan_name, const std::strin this->leave_dummy_channel(status_message); else this->send_message(IrcMessage("PART", {chan_name, status_message})); + channel->parting = true; } } -- cgit v1.2.3