# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1233773603 0
# Node ID 9e76018c62fa9de94b3e0f7d05fea4f302ce5b41
# Parent  a5195e3b0e44864647ea8ab485935af5cb387857
Fix for never checking if the first module for a host is already loaded (affects global modules)

diff -r a5195e3b0e44 -r 9e76018c62fa core/modulemanager.lua
--- a/core/modulemanager.lua	Mon Feb 02 18:05:21 2009 +0000
+++ b/core/modulemanager.lua	Wed Feb 04 18:53:23 2009 +0000
@@ -90,7 +90,9 @@
 	
 	if not modulemap[host] then
 		modulemap[host] = {};
-	elseif modulemap[host][module_name] then
+	end
+	
+	if modulemap[host][module_name] then
 		log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
 		return nil, "module-already-loaded";
 	elseif modulemap["*"][module_name] then