Merge remote-tracking branch 'upstream/master'

1 files changed, 2 insertions, 1 deletions

diff --git a/conn.go b/conn.go
index 1b7d838..f1b85c0 100644
--- a/conn.go
+++ b/conn.go
@@ -168,13 +168,14 @@ func (c *Conn) dial(display string) error {
 	// Connect to server
 	if len(socket) != 0 {
 		c.conn, err = net.Dial("unix", socket+":"+c.display)
-	} else if len(c.host) != 0 {
+	} else if len(c.host) != 0 && c.host != "unix" {
 		if protocol == "" {
 			protocol = "tcp"
 		}
 		c.conn, err = net.Dial(protocol,
 			c.host+":"+strconv.Itoa(6000+c.DisplayNumber))
 	} else {
+		c.host = ""
 		c.conn, err = net.Dial("unix", "/tmp/.X11-unix/X"+c.display)
 	}