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:
authorStefan Hacker <dd0t@users.sourceforge.net>2010-01-30 17:58:08 +0300
committerStefan Hacker <dd0t@users.sourceforge.net>2010-01-30 18:04:08 +0300
commitc1515fee40e0d021acefc7caa6e5813a4a2e11b5 (patch)
treed2204f2d7586509caff7afb77d0640cf1a5be312 /src/mumble/ACLEditor.cpp
parent53a00c7b977cedc2f971de174835542363a464f1 (diff)
Special case for Speak right in the ACLEditors indicate scope for WriteACL functionality
Diffstat (limited to 'src/mumble/ACLEditor.cpp')
-rw-r--r--src/mumble/ACLEditor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp
index 07d39b137..81f8e84ad 100644
--- a/src/mumble/ACLEditor.cpp
+++ b/src/mumble/ACLEditor.cpp
@@ -563,7 +563,7 @@ void ACLEditor::ACLEnableCheck() {
int idx;
for (idx=0;idx<qlACLAllow.count();idx++) {
// Only enable other checkboxes if writeacl isn't set
- bool enathis = ena && (qlPerms[idx] == ChanACL::Write || !(as && static_cast<int>(as->pAllow) & ChanACL::Write));
+ bool enathis = ena && (qlPerms[idx] == ChanACL::Write || !(as && static_cast<int>(as->pAllow) & ChanACL::Write) || qlPerms[idx] == ChanACL::Speak);
qlACLAllow[idx]->setEnabled(enathis);
qlACLDeny[idx]->setEnabled(enathis);
}
@@ -816,8 +816,8 @@ void ACLEditor::ACLPermissions_clicked() {
qlACLAllow[idx]->setChecked(false);
}
- qlACLAllow[idx]->setEnabled(ena);
- qlACLDeny[idx]->setEnabled(ena);
+ qlACLAllow[idx]->setEnabled(ena || p == ChanACL::Speak);
+ qlACLDeny[idx]->setEnabled(ena || p == ChanACL::Speak);
if (p == ChanACL::Write && qlACLAllow[idx]->isChecked())
ena = false;