qmp/socket: Only wait for mon.stream to be closed in Disconnect if initialised

tomponline · tomponline · commit f911ede00067 · 2023-06-27T21:40:37.000+01:00
This allows Disconnect() to be called as a way to cancel a Connect() call. Without Disconnect() blocking forever reading from a nil channel. Fixes #200 Signed-off-by: Thomas Parrott <tomp@tomp.uk>
diff --git a/qmp/socket.go b/qmp/socket.go
@@ -104,7 +104,9 @@ func (mon *SocketMonitor) Disconnect() error {
 	atomic.StoreInt32(mon.listeners, 0)
 	err := mon.c.Close()
 
-	for range mon.stream {
+	if mon.stream != nil {
+		for range mon.stream {
+		}
 	}
 
 	return err

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,9 @@ func (mon *SocketMonitor) Disconnect() error {`
`104`	`104`	`atomic.StoreInt32(mon.listeners, 0)`
`105`	`105`	`err := mon.c.Close()`
`106`	`106`
`107`		`- for range mon.stream {`
	`107`	`+ if mon.stream != nil {`
	`108`	`+ for range mon.stream {`
	`109`	`+ }`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`return err`