Fix Go mistake findings and stabilize integration timing

1 files changed, 17 insertions, 1 deletions

diff --git a/internal/flamegraph/liveserver.go b/internal/flamegraph/liveserver.go
index 4cc5629..8ae2b82 100644
--- a/internal/flamegraph/liveserver.go
+++ b/internal/flamegraph/liveserver.go
@@ -71,16 +71,32 @@ func openBrowserURL(url, openCommand string) error {
 	waitCh := make(chan error, 1)
 	go func() { waitCh <- cmd.Wait() }()
 
+	timer := time.NewTimer(750 * time.Millisecond)
+	defer stopAndDrainTimer(timer)
+
 	select {
 	case waitErr := <-waitCh:
 		if waitErr != nil {
 			return fmt.Errorf("browser command exited early: %w", waitErr)
 		}
-	case <-time.After(750 * time.Millisecond):
+	case <-timer.C:
 	}
 	return nil
 }
 
+func stopAndDrainTimer(timer *time.Timer) {
+	if timer == nil {
+		return
+	}
+	if timer.Stop() {
+		return
+	}
+	select {
+	case <-timer.C:
+	default:
+	}
+}
+
 func notifyLiveWarning(warningCb func(string), message string) {
 	if message == "" {
 		return