Merge pull request #30 from kognix/master

Wsapi 1.6 breaks Orbit and potentially other Lua 5.1 apps...
keplerproject · Dec 7, 2013 · 5c5a6aa · 5c5a6aa
2 parents de611a0 + f89bbea
commit 5c5a6aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/wsapi/common.lua b/src/wsapi/common.lua
@@ -18,6 +18,12 @@ local lfs = require "lfs"
 local tostring, tonumber, pairs, ipairs, error, type, pcall, xpcall, setmetatable, dofile, rawget, rawset, assert, loadfile =
   tostring, tonumber, pairs, ipairs, error, type, pcall, xpcall, setmetatable, dofile, rawget, rawset, assert, loadfile
 
+if _VERSION < "Lua 5.2" then
+	local coxpcall = require "coxpcall"
+	pcall = coxpcall.pcall
+	xpcall = coxpcall.xpcall
+end
+
 local package = package
 
 local _, ringer = pcall(require, "wsapi.ringer")

diff --git a/src/wsapi/xavante.lua b/src/wsapi/xavante.lua
@@ -6,10 +6,10 @@
 --
 -----------------------------------------------------------------------------
 
-require "coxpcall"
+local coxpcall = require "coxpcall"
 
-pcall = copcall
-xpcall = coxpcall
+pcall = coxpcall.pcall
+xpcall = coxpcall.xpcall
 
 local common = require"wsapi.common"