From 7a17c680916efc7b4812026933d65882a13fcf24 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Tue, 28 Mar 2017 23:19:15 +0200 Subject: [PATCH] Overlay_macx: fix code to work with removal of OverlaySettings::bUseWhitelist. This a quick band-aid until we implement proper support for launcher-detection in Overlay_macx. --- src/mumble/Overlay_macx.mm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/mumble/Overlay_macx.mm b/src/mumble/Overlay_macx.mm index 93a02a0d6b3..756deefe5c8 100644 --- a/src/mumble/Overlay_macx.mm +++ b/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) {