From 2ba4270cbbd528b93cd23701796ccf0a0ea6cb09 Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Tue, 9 Mar 2010 14:16:48 +0100
Subject: [PATCH] Fix inherit/inheritable for groups in editor

---
 src/mumble/ACLEditor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

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);