From d188ad6a1fb60f8331bb2e6a269836eba041d032 Mon Sep 17 00:00:00 2001
From: Zachary Clark-Williams <zachary.clark-williams@intel.com>
Date: Wed, 20 Aug 2025 00:46:44 -0700
Subject: [PATCH] NetworkPkg/WifiConnectionManagerDxe: UI Disconnect

- Fix WifiMgrOnTimerTick to ensure the timer does
not exit early when a disconnect is pending,
allowing UI-initiated disconnects to complete as
expected.

Signed-off-by: Zachary Clark-Williams <Zachary.Clark-Williams@intel.com>
---
 NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c
index 3b2ac0d887..072707faee 100644
--- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c
+++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c
@@ -1490,7 +1490,7 @@ WifiMgrOnTimerTick (
   }
 
   Nic = (WIFI_MGR_DEVICE_DATA *)Context;
-  if (Nic->ConnectPendingNetwork == NULL) {
+  if ((Nic->ConnectPendingNetwork == NULL) && !Nic->HasDisconnectPendingNetwork) {
     DEBUG ((DEBUG_VERBOSE, "[WiFi Connection Manager] No profile for connection, no scan triggered!\n"));
     gBS->SetTimer (Nic->TickTimer, TimerCancel, 0);
     return;