From ea464cef8d3c5b6028b04cd8737ce19396d52513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sat, 21 Mar 2026 12:50:42 +0800
Subject: [PATCH] daemon: Fix CloseService leaving instance non-nil on close
 error

---
 daemon/started_service.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/daemon/started_service.go b/daemon/started_service.go
index 7ebdac1e6..b97958595 100644
--- a/daemon/started_service.go
+++ b/daemon/started_service.go
@@ -226,13 +226,14 @@ func (s *StartedService) CloseService() error {
 		return os.ErrInvalid
 	}
 	s.updateStatus(ServiceStatus_STOPPING)
-	if s.instance != nil {
-		err := s.instance.Close()
+	instance := s.instance
+	s.instance = nil
+	if instance != nil {
+		err := instance.Close()
 		if err != nil {
 			return s.updateStatusError(err)
 		}
 	}
-	s.instance = nil
 	s.startedAt = time.Time{}
 	s.updateStatus(ServiceStatus_IDLE)
 	s.serviceAccess.Unlock()