Small refactor in on_quit()

2017-08-24 23:56:00 +02:00
parent c23c99dac1
commit 1997fb5c6a
1 changed files with 8 additions and 10 deletions
@@ -1017,19 +1017,17 @@ void IrcClient::on_quit(const IrcMessage& message)
      const std::string& chan_name = pair.first;
      IrcChannel* channel = pair.second.get();
      const IrcUser* user = channel->find_user(message.prefix);
+      if (!user)
+        continue;
      bool self = false;
      if (user == channel->get_self())
        self = true;
-      if (user)
-        {
-          std::string nick = user->nick;
-          channel->remove_user(user);
      Iid iid;
      iid.set_local(chan_name);
      iid.set_server(this->hostname);
      iid.type = Iid::Type::Channel;
-          this->bridge.send_muc_leave(iid, std::move(nick), txt, self, false);
-        }
+      this->bridge.send_muc_leave(iid, user->nick, txt, self, false);
+      channel->remove_user(user);
    }
 }