New module loader properly halts when load-time error occurs in module.

Uberi · Aug 1, 2013 · 040282b · 040282b
1 parent b0bf52e
commit 040282b
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/worldedit/init.lua b/worldedit/init.lua
@@ -1,15 +1,12 @@
 local path = minetest.get_modpath(minetest.get_current_modname())
 
 local loadmodule = function(path)
-	local results = {pcall(function()
-		return dofile(path)
-	end)}
-	if results[1] then --successfully loaded module
-		table.remove(results, 1) --remove status indicator
-		return unpack(results) --return all results
-	else --load error
-		print(results[2])
+	local file = io.open(path)
+	if not file then
+		return
 	end
+	file:close()
+	return dofile(path)
 end
 
 loadmodule(path .. "/manipulations.lua")