Merge branch 'win-firewall-errors'

2 files changed, 24 insertions, 3 deletions

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
index 656efd760b..6071ce515f 100644
--- a/gui/src/main/daemon-rpc.ts
+++ b/gui/src/main/daemon-rpc.ts
@@ -259,12 +259,21 @@ const tunnelStateSchema = oneOf(
   object({
     state: enumeration('error'),
     details: object({
-      is_blocking: boolean,
+      block_failure: maybe(
+        object({
+          reason: enumeration('generic', 'locked'),
+          details: maybe(
+            object({
+              name: string,
+              pid: number,
+            }),
+          ),
+        }),
+      ),
       cause: oneOf(
         object({
           reason: enumeration(
             'ipv6_unavailable',
-            'set_firewall_policy_error',
             'set_dns_error',
             'start_tunnel_error',
             'is_offline',
@@ -272,6 +281,18 @@ const tunnelStateSchema = oneOf(
           ),
         }),
         object({
+          reason: enumeration('set_firewall_policy_error'),
+          details: object({
+            reason: enumeration('generic', 'locked'),
+            details: maybe(
+              object({
+                name: string,
+                pid: number,
+              }),
+            ),
+          }),
+        }),
+        object({
           reason: enumeration('auth_failed'),
           details: maybe(string),
         }),
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 18dfc67d29..f375de7eca 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -863,7 +863,7 @@ class ApplicationMain {
         return 'securing';
 
       case 'error':
-        if (tunnelState.details.isBlocking) {
+        if (!tunnelState.details.blockFailure) {
           return 'securing';
         } else {
           return 'unsecured';