api: fix crash when changing settings of an on-demand source that is …

…idle (#3246)
bluenviron · Apr 15, 2024 · ade077f · ade077f
1 parent 1c135fb
commit ade077f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/core/path.go b/internal/core/path.go
@@ -371,7 +371,7 @@ func (pa *path) doReloadConf(newConf *conf.Path) {
 	pa.confMutex.Unlock()
 
 	if pa.conf.HasStaticSource() {
-		go pa.source.(*staticSourceHandler).reloadConf(newConf)
+		pa.source.(*staticSourceHandler).reloadConf(newConf)
 	}
 
 	if pa.conf.Record {

diff --git a/internal/core/static_source_handler.go b/internal/core/static_source_handler.go
@@ -224,10 +224,18 @@ func (s *staticSourceHandler) run() {
 }
 
 func (s *staticSourceHandler) reloadConf(newConf *conf.Path) {
-	select {
-	case s.chReloadConf <- newConf:
-	case <-s.ctx.Done():
+	ctx := s.ctx
+
+	if !s.running {
+		return
 	}
+
+	go func() {
+		select {
+		case s.chReloadConf <- newConf:
+		case <-ctx.Done():
+		}
+	}()
 }
 
 // APISourceDescribe instanceements source.