# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335037932 -3600
# Node ID 57a4f863e48f60afa641ec8c10f1538b2b56dfb3
# Parent  e0bd8587f2fb86bcafa15b23c290598223c51833
mod_admin_telnet: module:load(): Fix 'global-module-already-loaded' errors when successfully loading a global module (fixes #228)

diff -r e0bd8587f2fb -r 57a4f863e48f plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Sat Apr 21 20:39:52 2012 +0100
+++ b/plugins/mod_admin_telnet.lua	Sat Apr 21 20:52:12 2012 +0100
@@ -292,16 +292,22 @@
 	hosts = get_hosts_set(hosts);
 	
 	-- Load the module for each host
-	local ok, err, count = true, nil, 0;
+	local ok, err, count, mod = true, nil, 0, nil;
 	for host in hosts do
 		if (not mm.is_loaded(host, name)) then
-			ok, err = mm.load(host, name, config);
-			if not ok then
+			mod, err = mm.load(host, name, config);
+			if not mod then
 				ok = false;
+				if err == "global-module-already-loaded" then
+					if count > 0 then
+						ok, err, count = true, nil, 1;
+					end
+					break;
+				end
 				self.session.print(err or "Unknown error loading module");
 			else
 				count = count + 1;
-				self.session.print("Loaded for "..host);
+				self.session.print("Loaded for "..mod.module.host);
 			end
 		end
 	end