Skip to content
Permalink
Browse files

Merge PR #2985: overlay: treat launchers as implicitly blacklisted pr…

…ograms.
  • Loading branch information...
mkrautz committed Apr 1, 2017
2 parents fc13fd1 + a9bdde0 commit 15d18eea0c2a63b469b05aa0d39d3a8d3956bf24
Showing with 7 additions and 4 deletions.
  1. +7 −4 overlay/excludecheck.cpp
@@ -36,11 +36,14 @@ static void ExcludeCheckEnsureInitialized() {
}

/// Check whether the program at |absExeName|
/// (with basename of |exeName|) is in the Mumble
/// overlay program blacklist.
/// (with basename of |exeName|) is blacklisted.
///
/// Note that programs that are added as launchers
/// are also implicitly treated as being blacklisted.
static bool isBlacklistedExe(const std::string &absExeName, const std::string &exeName) {
for (size_t i = 0; i < vBlacklist.size(); i++) {
std::string &val = vBlacklist.at(i);
std::vector<string> combinedBlacklist = vmerge(vBlacklist, vLaunchers);
for (size_t i = 0; i < combinedBlacklist.size(); i++) {
std::string &val = combinedBlacklist.at(i);
if (isAbsPath(val)) {
if (val == absExeName) {
return true;

0 comments on commit 15d18ee

Please sign in to comment.
You can’t perform that action at this time.