From ca70fe9ddc661f15f0b0550089f52d4572f78d69 Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Tue, 3 Aug 2021 16:33:59 +0530
Subject: [PATCH] UI: When setting on-demand, avoid a second
 saveToPreferences() call

Signed-off-by: Roopesh Chander <roop@roopc.net>
---
 Sources/WireGuardApp/Tunnel/TunnelsManager.swift | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift
index 20bd1ca..c6d4f2d 100644
--- a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift
+++ b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift
@@ -350,6 +350,7 @@ class TunnelsManager {
         }
         let isActivatingOnDemand = !tunnelProviderManager.isOnDemandEnabled && isOnDemandEnabled
         tunnelProviderManager.isOnDemandEnabled = isOnDemandEnabled
+        tunnelProviderManager.isEnabled = true
         tunnelProviderManager.saveToPreferences { error in
             if let error = error {
                 wg_log(.error, message: "Modify On-Demand: Saving configuration failed: \(error)")
@@ -367,20 +368,7 @@ class TunnelsManager {
                         completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel(systemError: error))
                         return
                     }
-                    if !tunnelProviderManager.isEnabled {
-                        // In case the tunnel has gotten disabled, re-enable and save it.
-                        wg_log(.debug, staticMessage: "Modify On-Demand: Tunnel is disabled. Re-enabling and saving")
-                        tunnelProviderManager.isEnabled = true
-                        tunnelProviderManager.saveToPreferences { error in
-                            if let error = error {
-                                wg_log(.error, message: "Modify On-Demand: Error saving tunnel after re-enabling: \(error)")
-                                completionHandler(TunnelsManagerError.systemErrorOnModifyTunnel(systemError: error))
-                                return
-                            }
-                        }
-                    } else {
-                        completionHandler(nil)
-                    }
+                    completionHandler(nil)
                 }
             } else {
                 completionHandler(nil)