From 8284f0b8258501f51c0e23a8307a27d54dd5a886 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 11 May 2012 18:55:23 +0100 Subject: moduleapi: Don't auto-reload self when already reloading (fixes reload of modules with cyclic dependencies) --- core/moduleapi.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 57367255..44c84de1 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -112,7 +112,7 @@ function api:depends(name) if not self.dependencies then self.dependencies = {}; self:hook("module-reloaded", function (event) - if self.dependencies[event.module] then + if self.dependencies[event.module] and not self.reloading then self:log("info", "Auto-reloading due to reload of %s:%s", event.host, event.module); modulemanager.reload(self.host, self.name); return; -- cgit v1.2.3