From 9f3fb83a55814a493eab7a75b675ea0e61da74a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Tue, 14 Jul 2026 13:07:44 +0800
Subject: [PATCH] Fix SetGroupExpand race

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

diff --git a/daemon/started_service.go b/daemon/started_service.go
index f29324fb6..c48a7faed 100644
--- a/daemon/started_service.go
+++ b/daemon/started_service.go
@@ -679,14 +679,11 @@ func (s *StartedService) SelectOutbound(ctx context.Context, request *SelectOutb
 
 func (s *StartedService) SetGroupExpand(ctx context.Context, request *SetGroupExpandRequest) (*emptypb.Empty, error) {
 	s.serviceAccess.RLock()
-	switch s.serviceStatus.Status {
-	case ServiceStatus_STARTING, ServiceStatus_STARTED:
-	default:
-		s.serviceAccess.RUnlock()
+	defer s.serviceAccess.RUnlock()
+	if s.serviceStatus.Status != ServiceStatus_STARTED {
 		return nil, os.ErrInvalid
 	}
 	boxService := s.instance
-	s.serviceAccess.RUnlock()
 	if boxService.cacheFile != nil {
 		err := boxService.cacheFile.StoreGroupExpand(request.GroupTag, request.IsExpand)
 		if err != nil {