Merge default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-09-11 13:09:01 -03:00
7 changed files with 244 additions and 355 deletions
+3 -2
View File
@@ -239,8 +239,9 @@ function love.createhandlers()
if love.directorydropped then return love.directorydropped(dir) end
end,
lowmemory = function ()
if love.lowmemory then love.lowmemory() end
collectgarbage()
collectgarbage()
if love.lowmemory then return love.lowmemory() end
end,
}, {
__index = function(self, name)
@@ -678,5 +679,5 @@ return function()
local result, retval = xpcall(love.run, deferErrhand)
if not result then return 1 end
return tonumber(retval) or 0
return retval == nil and 0 or retval
end