summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2026-03-18 20:28:17 +0100
committerDavid Lönnhager <david.l@mullvad.net>2026-03-18 20:28:17 +0100
commitc1b05323277b042b8e72909910c033ced60dca11 (patch)
tree396d6d91dc16e0c1c7136ddede5fce99070328da
parent675a2c6fd2b0528fbfccf6653dcd086487ff9338 (diff)
downloadmullvadvpn-win-configurable-guids.tar.xz
mullvadvpn-win-configurable-guids.zip
-rw-r--r--windows/winfw/src/winfw/winfw.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/windows/winfw/src/winfw/winfw.cpp b/windows/winfw/src/winfw/winfw.cpp
index cec1a96d49..d857943139 100644
--- a/windows/winfw/src/winfw/winfw.cpp
+++ b/windows/winfw/src/winfw/winfw.cpp
@@ -681,12 +681,11 @@ WinFw_HasSublayerConflict(const WinFwSublayerGuids *guids)
{
for (const auto &key : keys)
{
- if (s.subLayerKey == key
- && s.providerKey != nullptr
- && *s.providerKey != MullvadGuids::Provider()
- && *s.providerKey != MullvadGuids::ProviderPersistent())
+ if (s.subLayerKey == key)
{
- conflict = true;
+ conflict = s.providerKey == nullptr
+ || (*s.providerKey != MullvadGuids::Provider()
+ && *s.providerKey != MullvadGuids::ProviderPersistent());
return false;
}
}