Merge pull request #490 from zardyh/ComputerCraft/master

Propagate errors arising from API loading
cc-tweaked · Nov 15, 2017 · 1cf10c5 · 1cf10c5
2 parents 6691ec8 + d766f8b
commit 1cf10c5
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/main/resources/assets/computercraft/lua/bios.lua b/src/main/resources/assets/computercraft/lua/bios.lua
@@ -609,14 +609,12 @@ function os.loadAPI( _sPath )
     if fnAPI then
         local ok, err = pcall( fnAPI )
         if not ok then
-            printError( err )
             tAPIsLoading[sName] = nil
-            return false
+            return error( "Failed to load API " .. sName .. " due to " .. err, 1 )
         end
     else
-        printError( err )
         tAPIsLoading[sName] = nil
-        return false
+        return error( "Failed to load API " .. sName .. " due to " .. err, 1 )
     end
 
     local tAPI = {}