fix: deadlock for blocking channel

go-co-op · May 7, 2023 · a8a9b49 · a8a9b49
1 parent f6cb61e
commit a8a9b49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scheduler.go b/scheduler.go
@@ -868,10 +868,10 @@ func (s *Scheduler) Stop() {
 }
 
 func (s *Scheduler) stop() {
-	s.setRunning(false)
 	s.stopJobs(s.jobs)
 	s.executor.stop()
 	s.StopBlockingChan()
+	s.setRunning(false)
 }
 
 func (s *Scheduler) stopJobs(jobs []*Job) {
@@ -1376,7 +1376,7 @@ func (s *Scheduler) CustomTimer(customTimer func(d time.Duration, f func()) *tim
 
 func (s *Scheduler) StopBlockingChan() {
 	s.startBlockingStopChanMutex.Lock()
-	if s.startBlockingStopChan != nil {
+	if s.IsRunning() && s.startBlockingStopChan != nil {
 		close(s.startBlockingStopChan)
 	}
 	s.startBlockingStopChanMutex.Unlock()