task: Fix context not continuous

SagerNet · Jul 31, 2024 · 4498e57 · 4498e57
1 parent f97054e
commit 4498e57
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/common/task/task.go b/common/task/task.go
@@ -64,7 +64,7 @@ func (g *Group) RunContextList(contextList []context.Context) error {
 	}
 
 	taskContext, taskFinish := common.ContextWithCancelCause(context.Background())
-	taskCancelContext, taskCancel := common.ContextWithCancelCause(context.Background())
+	taskCancelContext, taskCancel := common.ContextWithCancelCause(contextList[0])
 
 	var errorAccess sync.Mutex
 	var returnError error
@@ -112,11 +112,8 @@ func (g *Group) RunContextList(contextList []context.Context) error {
 		}()
 	}
 
-	selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskCancelContext}, contextList...))
-
-	if selectedContext != 0 {
-		taskCancel(upstreamErr)
-	}
+	selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskCancelContext}, contextList[1:]...))
+	taskCancel(upstreamErr)
 
 	if g.cleanup != nil {
 		g.cleanup()