From 799d1d98fca326d582431e1a41b62298ad19dacd Mon Sep 17 00:00:00 2001
From: Benjamin Erhart <berhart@netzarchitekten.com>
Date: Wed, 15 Apr 2026 15:36:36 +0200
Subject: [PATCH] Issue #3: Minor changes to improve check, if settings are
 actually on.

---
 dns/BlocklistOption.swift | 2 +-
 dns/ViewModel.swift       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dns/BlocklistOption.swift b/dns/BlocklistOption.swift
index 38e582d..2afffe1 100644
--- a/dns/BlocklistOption.swift
+++ b/dns/BlocklistOption.swift
@@ -71,7 +71,7 @@ enum BlocklistOption: String, CaseIterable, Identifiable {
     var settings: NEDNSOverHTTPSSettings {
         let settings = NEDNSOverHTTPSSettings(servers: [ipv4, ipv6])
         settings.serverURL = URL(string: "https://\(server)/dns-query")
-        settings.matchDomains = [""]
+        settings.matchDomains = ["", "invalid"]
 
         return settings
     }
diff --git a/dns/ViewModel.swift b/dns/ViewModel.swift
index 6441fe3..5b331d0 100644
--- a/dns/ViewModel.swift
+++ b/dns/ViewModel.swift
@@ -64,7 +64,7 @@ class ViewModel: NSObject, ObservableObject {
                 return
             }
 
-            if let settings = manager.dnsSettings {
+            if manager.isEnabled, let settings = manager.dnsSettings {
                 for dnsServer in BlocklistOption.allCases {
                     if settings.servers.contains(dnsServer.ipv4) {
                         await MainActor.run {
@@ -109,6 +109,10 @@ class ViewModel: NSObject, ObservableObject {
 
                     delayedToggle(false)
                 }
+
+                if !manager.isEnabled {
+                    delayedToggle(false)
+                }
             }
             else {
                 do {