Ensure prerunner termination

cmaglie · cmaglie · commit bc032f1a7da7 · 2025-10-13T11:27:35.000+02:00
diff --git a/internal/arduino/builder/internal/detector/detector.go b/internal/arduino/builder/internal/detector/detector.go
@@ -288,7 +288,11 @@ func (l *SketchLibrariesDetector) findIncludes(
 			}
 		}
 	}
-	defer l.preRunner.Cancel()
+	defer func() {
+		if l.preRunner != nil {
+			l.preRunner.Cancel()
+		}
+	}()
 
 	l.addIncludeFolder(buildCorePath)
 	if buildVariantPath != nil {
@@ -430,9 +434,8 @@ func (l *SketchLibrariesDetector) findMissingIncludesInCompilationUnit(
 
 				// Stop the pre-runner
 				if l.preRunner != nil {
-					preRunner := l.preRunner
+					l.preRunner.Cancel()
 					l.preRunner = nil
-					go preRunner.Cancel()
 				}
 
 				// Run the actual preprocessor

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,11 @@ func (l *SketchLibrariesDetector) findIncludes(`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`	`}`
`291`		`- defer l.preRunner.Cancel()`
	`291`	`+ defer func() {`
	`292`	`+ if l.preRunner != nil {`
	`293`	`+ l.preRunner.Cancel()`
	`294`	`+ }`
	`295`	`+ }()`
`292`	`296`
`293`	`297`	`l.addIncludeFolder(buildCorePath)`
`294`	`298`	`if buildVariantPath != nil {`
`@@ -430,9 +434,8 @@ func (l *SketchLibrariesDetector) findMissingIncludesInCompilationUnit(`
`430`	`434`
`431`	`435`	`// Stop the pre-runner`
`432`	`436`	`if l.preRunner != nil {`
`433`		`- preRunner := l.preRunner`
	`437`	`+ l.preRunner.Cancel()`
`434`	`438`	`l.preRunner = nil`
`435`		`- go preRunner.Cancel()`
`436`	`439`	`}`
`437`	`440`
`438`	`441`	`// Run the actual preprocessor`