Skip to content
Permalink
Browse files

Merge PR #2975: Overlay_macx: fix code to work with removal of Overla…

…ySettings::bUseWhitelist.
  • Loading branch information...
mkrautz committed Mar 28, 2017
2 parents fdd837c + 7a17c68 commit b47b1dac02ee54c85ccf7e8c1cc7cb81ee927352
Showing with 17 additions and 5 deletions.
  1. +17 −5 src/mumble/Overlay_macx.mm
@@ -76,12 +76,24 @@ - (void) appLaunched:(NSNotification *)notification {

QString qsBundleIdentifier = QString::fromUtf8([bundleId UTF8String]);

if (g.s.os.bUseWhitelist) {
if (g.s.os.qslWhitelist.contains(qsBundleIdentifier))
overlayEnabled = YES;
} else {
if (! g.s.os.qslBlacklist.contains(qsBundleIdentifier))
switch (g.s.os.oemOverlayExcludeMode) {
case OverlaySettings::LauncherFilterExclusionMode: {
qWarning("Overlay_macx: launcher filter mode not implemented on macOS, allowing everything");
overlayEnabled = YES;
break;
}
case OverlaySettings::WhitelistExclusionMode: {
if (g.s.os.qslWhitelist.contains(qsBundleIdentifier)) {
overlayEnabled = YES;
}
break;
}
case OverlaySettings::BlacklistExclusionMode: {
if (! g.s.os.qslBlacklist.contains(qsBundleIdentifier)) {
overlayEnabled = YES;
}
break;
}
}

if (overlayEnabled) {

0 comments on commit b47b1da

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