From 7e4a0cdbfdeb421b12e42e7db6d6929f11abf738 Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Fri, 22 Jan 2021 17:49:31 +0100
Subject: [PATCH] Fix DNS/proxy loading current settings too late

---
 .../macOS/Scenes/Service/Customization/DNSViewController.swift | 3 ++-
 .../Scenes/Service/Customization/ProxyViewController.swift     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Passepartout/App/macOS/Scenes/Service/Customization/DNSViewController.swift b/Passepartout/App/macOS/Scenes/Service/Customization/DNSViewController.swift
index d792dad0..51ce7d87 100644
--- a/Passepartout/App/macOS/Scenes/Service/Customization/DNSViewController.swift
+++ b/Passepartout/App/macOS/Scenes/Service/Customization/DNSViewController.swift
@@ -86,6 +86,8 @@ class DNSViewController: NSViewController, ProfileCustomization {
             tableDNSDomains.rightAnchor.constraint(equalTo: viewDNSDomains.rightAnchor),
         ])
         
+        loadSettings(from: currentChoice)
+
         popupChoice.removeAllItems()
         for choice in choices {
             popupChoice.addItem(withTitle: choice.description)
@@ -95,7 +97,6 @@ class DNSViewController: NSViewController, ProfileCustomization {
         }
         tableDNSAddresses.rowTemplate = Templates.server
         tableDNSDomains.rowTemplate = Templates.domain
-        loadSettings(from: currentChoice)
     }
     
     // MARK: Actions
diff --git a/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift b/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
index d80f7b50..bf4890d5 100644
--- a/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
+++ b/Passepartout/App/macOS/Scenes/Service/Customization/ProxyViewController.swift
@@ -80,6 +80,8 @@ class ProxyViewController: NSViewController, ProfileCustomization {
             tableProxyBypass.rightAnchor.constraint(equalTo: viewProxyBypass.rightAnchor),
         ])
         
+        loadSettings(from: currentChoice)
+
         popupChoice.removeAllItems()
         for choice in choices {
             popupChoice.addItem(withTitle: choice.description)
@@ -88,7 +90,6 @@ class ProxyViewController: NSViewController, ProfileCustomization {
             }
         }
         tableProxyBypass.rowTemplate = Templates.bypass
-        loadSettings(from: currentChoice)
     }
     
     // MARK: Actions