Merge pull request #201 from tomponline/tp-disconnect

Allow Disconnect to be used to cancel ongoing Connect call

Author: sam-github

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
@@ -266,7 +268,7 @@ func (mon *SocketMonitor) RunWithFile(command []byte, file *os.File) ([]byte, er
 type banner struct {
 	QMP struct {
 		Capabilities []string `json:"capabilities"`
-		Version Version `json:"version"`
+		Version      Version  `json:"version"`
 	} `json:"QMP"`
 }