summaryrefslogtreecommitdiff
path: root/src/bridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/bridge')
-rw-r--r--src/bridge/bridge.cpp4
-rw-r--r--src/bridge/bridge.hpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index bb3bfb0..ed685f9 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -52,7 +52,7 @@ void Bridge::clean()
while (it != this->irc_clients.end())
{
IrcClient* client = it->second.get();
- if (!client->is_connected())
+ if (!client->is_connected() && !client->is_connecting())
it = this->irc_clients.erase(it);
else
++it;
@@ -249,7 +249,7 @@ std::string Bridge::get_own_nick(const Iid& iid)
return "";
}
-size_t Bridge::connected_clients() const
+size_t Bridge::active_clients() const
{
return this->irc_clients.size();
}
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp
index 58ca24c..e16ea39 100644
--- a/src/bridge/bridge.hpp
+++ b/src/bridge/bridge.hpp
@@ -105,9 +105,9 @@ public:
*/
std::string get_own_nick(const Iid& iid);
/**
- * Get the number of server to which this bridge is connected.
+ * Get the number of server to which this bridge is connected or connecting.
*/
- size_t connected_clients() const;
+ size_t active_clients() const;
private:
/**
@@ -125,7 +125,7 @@ private:
* The JID of the user associated with this bridge. Messages from/to this
* JID are only managed by this bridge.
*/
- std::string user_jid;
+ const std::string user_jid;
/**
* One IrcClient for each IRC server we need to be connected to.
* The pointer is shared by the bridge and the poller.