Hopefully sort this AccessGroup::HasPriv once and for all

1 files changed, 7 insertions, 2 deletions

diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index ce5bef71c..3b246fece 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -258,12 +258,14 @@ AccessGroup ChannelInfo::AccessFor(User *u)
 
 	AccessGroup group;
 
+	group.SuperAdmin = u->SuperAdmin;
+	group.Founder = IsFounder(u, this);
+	group.ci = this;	
+
 	for (unsigned i = 0, end = this->access.size(); i < end; ++i)
 		if (this->access[i]->Matches(u, nc))
 			group.push_back(this->access[i]);
 	
-	group.SuperAdmin = u->SuperAdmin;
-	
 	return group;
 }
 
@@ -271,6 +273,9 @@ AccessGroup ChannelInfo::AccessFor(NickCore *nc)
 {
 	AccessGroup group;
 
+	group.Founder = (this->founder && this->founder == nc);
+	group.ci = this;
+
 	for (unsigned i = 0, end = this->access.size(); i < end; ++i)
 		if (this->access[i]->Matches(NULL, nc))
 			group.push_back(this->access[i]);