From daca0e85a8d4b4ce91c545bd44aa636224b2c87d Mon Sep 17 00:00:00 2001
From: Paul Donald <newtwen+github@gmail.com>
Date: Wed, 4 Mar 2026 01:13:00 +0100
Subject: [PATCH] luci-base: prevent save/traceback race for _state

A _state race is possible during save when a refresh is in
progress. Attempt to avoid it by not nulling state prior
to refresh.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
---
 modules/luci-base/htdocs/luci-static/resources/network.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 6d84f12a5f..67ed3bf522 100644
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -354,7 +354,6 @@ function initNetworkState(refresh) {
 	if (_state == null || refresh) {
 		const hasWifi = L.hasSystemFeature('wifi');
 
-		if (refresh) _state = null;
 		if (refresh || !_init) {
 			_init = Promise.all([
 			L.resolveDefault(callNetworkInterfaceDump(), []),
@@ -538,6 +537,9 @@ function initNetworkState(refresh) {
 
 	}
 
+	if (refresh)
+		return _init;
+
 	return (_state != null ? Promise.resolve(_state) : _init);
 }