From 015edcd69a3d320325a8e7e73b2272678121adac Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Fri, 1 Mar 2019 14:37:41 -0500
Subject: [PATCH] mnet: fix PacketConn closing

---
 mnet/mnet.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mnet/mnet.go b/mnet/mnet.go
index 57c2f3b..2bffc3c 100644
--- a/mnet/mnet.go
+++ b/mnet/mnet.go
@@ -130,7 +130,11 @@ func (l *Listener) Accept() (net.Conn, error) {
 // logging.
 func (l *Listener) Close() error {
 	mlog.Info("listener closing", l.ctx)
-	return l.Listener.Close()
+	if l.Listener != nil {
+		return l.Listener.Close()
+	} else {
+		return l.PacketConn.Close()
+	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////