fix(webkit): stop async prewarm on ctx cancel

Avoid continuing GTK idle prewarm when the caller context is canceled; exit early and release the waitgroup.

1 file · +13 -1

M internal/infrastructure/webkit/pool.go +13 -1


@@ -232,8 +232,20 @@ func (p *WebViewPool) PrewarmAsync(ctx context.Context, count int) {
232	232
233	233		var schedule func()
234	234		schedule = func() {
	235	+	// Stop early if the caller canceled the operation.
	236	+	if err := ctx.Err(); err != nil {
	237	+	log.Debug().Err(err).Msg("async webview pool prewarm canceled")
	238	+	doneOnce.Do(p.wg.Done)
	239	+	return
	240	+	}
	241	+
235	242		cb := glib.SourceFunc(func(_ uintptr) bool {
236		-	log := logging.FromContext(ctx)
	243	+	// Stop if the caller canceled the operation.
	244	+	if err := ctx.Err(); err != nil {
	245	+	log.Debug().Err(err).Msg("async webview pool prewarm canceled")
	246	+	doneOnce.Do(p.wg.Done)
	247	+	return false
	248	+	}
237	249
238	250		// Stop if pool is closing/closed.
239	251		if p.closed.Load() {


@@ -232,8 +232,20 @@ func (p *WebViewPool) PrewarmAsync(ctx context.Context, count int) {
232			232
233		var schedule func()	233		var schedule func()
234		schedule = func() {	234		schedule = func() {
			235	+	// Stop early if the caller canceled the operation.
			236	+	if err := ctx.Err(); err != nil {
			237	+	log.Debug().Err(err).Msg("async webview pool prewarm canceled")
			238	+	doneOnce.Do(p.wg.Done)
			239	+	return
			240	+	}
			241	+
235		cb := glib.SourceFunc(func(_ uintptr) bool {	242		cb := glib.SourceFunc(func(_ uintptr) bool {
236	-	log := logging.FromContext(ctx)	243	+	// Stop if the caller canceled the operation.
			244	+	if err := ctx.Err(); err != nil {
			245	+	log.Debug().Err(err).Msg("async webview pool prewarm canceled")
			246	+	doneOnce.Do(p.wg.Done)
			247	+	return false
			248	+	}
237			249
238		// Stop if pool is closing/closed.	250		// Stop if pool is closing/closed.
239		if p.closed.Load() {	251		if p.closed.Load() {