Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2010-03-09 16:16:48 +0300
committerThorvald Natvig <slicer@users.sourceforge.net>2010-03-09 16:24:26 +0300
commit2ba4270cbbd528b93cd23701796ccf0a0ea6cb09 (patch)
tree590cb932dedd6f3b8ee48c5338d77ba47078944d /src/mumble/ACLEditor.cpp
parent6d4c13fb95764538a90ece5d060a4bc791eb0ad6 (diff)
Fix inherit/inheritable for groups in editor
Diffstat (limited to 'src/mumble/ACLEditor.cpp')
-rw-r--r--src/mumble/ACLEditor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp
index f3ca263b3..d6f083d35 100644
--- a/src/mumble/ACLEditor.cpp
+++ b/src/mumble/ACLEditor.cpp
@@ -180,6 +180,9 @@ ACLEditor::ACLEditor(int channelid, const MumbleProto::ACL &mea, QWidget *p) : Q
const MumbleProto::ACL_ChanGroup &gs = mea.groups(i);
ACLGroup *gp = new ACLGroup(u8(gs.name()));
+ gp->bInherit = gs.inherit();
+ gp->bInherited = gs.inherited();
+ gp->bInheritable = gs.inheritable();
for (int j=0;j<gs.add_size();++j)
gp->qsAdd.insert(gs.add(j));
for (int j=0;j<gs.remove_size();++j)
@@ -290,6 +293,8 @@ void ACLEditor::accept() {
continue;
MumbleProto::ACL_ChanGroup *mpg = msg.add_groups();
mpg->set_name(u8(gp->qsName));
+ mpg->set_inherit(gp->bInherit);
+ mpg->set_inheritable(gp->bInheritable);
foreach(int pid, gp->qsAdd)
if (pid >= 0)
mpg->add_add(pid);