# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1666617912 -7200
# Node ID 517b5702c5a1f3b77aa0330f87fe23086b4619ad
# Parent  5d4957c8a972a675af41c130b15339b54ced0c35# Parent  3835c397b1297a646b5b86211cea41a9292a5361
Merge 0.12->trunk

diff -r 5d4957c8a972 -r 517b5702c5a1 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Thu Oct 20 17:37:33 2022 +0200
+++ b/plugins/mod_admin_shell.lua	Mon Oct 24 15:25:12 2022 +0200
@@ -780,7 +780,11 @@
 		width = 5;
 		align = "right";
 		key = "conn";
-		mapper = function(conn) return conn:serverport(); end;
+		mapper = function(conn)
+			if conn then
+				return conn:serverport();
+			end
+		end;
 	};
 	dir = {
 		title = "Dir";