summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2013-07-01 19:10:21 +0200
committerattilamolnar <attilamolnar@hush.com>2013-07-01 19:10:21 +0200
commit93b12896dab1692800c4b6d2d9f35e1a23102028 (patch)
tree1befb517184bc2c2b9ce44f3627d0f4fb56af1ab /src/channels.cpp
parenta7f61e181fa1859a8f3d8d233d55e71fc000f1e5 (diff)
Fix a few oversights
This partially reverts e0cb6bd46fb1d804ad6adea5688c844f7e1a0f6f
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 09b4e8dc9..8a4ed3f49 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -333,16 +333,16 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
void Channel::ForceJoin(User* user, const std::string* privs, bool bursting, bool created_by_local)
{
- Membership* memb = this->AddUser(user);
- if (!memb)
- return; // Already on the channel
-
if (IS_SERVER(user))
{
ServerInstance->Logs->Log("CHANNELS", LOG_DEBUG, "Attempted to join server user " + user->uuid + " to channel " + this->name);
return;
}
+ Membership* memb = this->AddUser(user);
+ if (!memb)
+ return; // Already on the channel
+
user->chans.insert(this);
if (privs)