Merge pull request #753 from vlabo/develop

Fix automatic merge compile errors

resolver/config.go

@@ -119,7 +119,7 @@ The format is: "protocol://ip:port?parameter=value&parameter=value"
 			config.DisplayOrderAnnotation: cfgOptionNameServersOrder,
 			config.CategoryAnnotation:     "Servers",
 			config.QuickSettingsAnnotation: []config.QuickSetting{
-			{
+				{
 					Name:   "Cloudflare (with Malware Filter)",
 					Action: config.QuickReplace,
 					Value: []string{

resolver/resolvers.go

@@ -43,9 +43,10 @@ var (
 	systemResolvers       []*Resolver          // all resolvers that were assigned by the system
 	localScopes           []*Scope             // list of scopes with a list of local resolvers that can resolve the scope
 	activeResolvers       map[string]*Resolver // lookup map of all resolvers
-  resolverInitDomains   map[string]struct{}  // a set with all domains of the dns resolvers
+	currentResolverConfig []string             // current active resolver config, to detect changes
+	resolverInitDomains   map[string]struct{}  // a set with all domains of the dns resolvers
 
-	resolversLock         sync.RWMutex
+	resolversLock sync.RWMutex
 )
 
 func indexOfScope(domain string, list []*Scope) int {