safcm: don't hang on error before a connection is established

[safcm/safcm.git] / rpc / conn.go

diff --git a/rpc/conn.go b/rpc/conn.go
index 9786941c7e808966a9a76841bfd6e03981f81ba6..03b748545f12c1c588acb24bac2761e0b439b25c 100644 (file)
--- a/rpc/conn.go
+++ b/rpc/conn.go
@@ -124,9 +124,14 @@ func (c *Conn) wait() error {
 }
 
 // Kill forcefully terminates the connection. It's safe to call Kill (and
-// Wait) multiple times.
+// Wait) multiple times. Calling it before Dial*() was called will only close
+// the Events channel.
 func (c *Conn) Kill() error {
        if c.cmd == nil {
+               if c.events != nil {
+                       close(c.events)
+                       c.events = nil
+               }
                return fmt.Errorf("Dial*() not called or already terminated")
        }