TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-09 04:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Угу

Browse Source
This commit is contained in:
Igor Timofeev 2016-07-12 23:27:09 +03:00
parent d0d3322163
commit 308351d548
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Applications.txt
View File

@ -299,7 +299,7 @@
name="lib/MineOSCore.lua",
url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
type="Library",
version=1.15,
version=1.16,
},
{
name="lib/GUI.lua",

43
lib/MineOSCore.lua
View File

@ -290,36 +290,43 @@ function MineOSCore.safeLaunch(path, ...)
local finalSuccess, finalReason = true, true
local loadSuccess, loadReason = loadfile(path)
if loadSuccess then
local function launcher()
loadSuccess(table.unpack(args))
end
if fs.exists(path) then
if loadSuccess then
local function launcher()
loadSuccess(table.unpack(args))
end
local runSuccess, runReason = xpcall(launcher, debug.traceback)
if not runSuccess then
if type(runReason) == "string" then
if not string.find(runReason, "interrupted", 1, 15) then
finalSuccess, finalReason = false, runReason
local runSuccess, runReason = xpcall(launcher, debug.traceback)
if not runSuccess then
if type(runReason) == "string" then
if not string.find(runReason, "interrupted", 1, 15) then
finalSuccess, finalReason = false, runReason
end
end
end
else
finalSuccess, finalReason = false, loadReason
end
else
finalSuccess, finalReason = false, loadReason
finalSuccess, finalReason = false, unicode.sub(debug.traceback(), 19, -1)
end
if not finalSuccess then
local errorLine = 1
local starting, ending = string.find(finalReason, "%:%d+%:")
--Проверяем, все ли удачно у нас нашлось - строка ошибки и т.п.
if starting and ending then
local errorLine = tonumber(unicode.sub(finalReason, starting + 1, ending - 1))
path = unicode.sub(finalReason, 1, starting - 1)
errorLine = tonumber(unicode.sub(finalReason, starting + 1, ending - 1))
--Проверяем, стоит ли нам врубать отсылку отчетов на мой сервер, ибо это должно быть онли у моих прожек
local applications = files.loadTableFromFile(MineOSCore.paths.applicationList)
local applicationExists = false
for i = 1, #applications do if path == "/" .. applications[i].name then applicationExists = true; break end end
drawErrorWindow(path, errorLine, finalReason, applicationExists)
else
GUI.error("Unknown error in lib/MineOSCore.lua: possible reason is \"" .. tostring(finalReason) .. "\"")
end
local applications = files.loadTableFromFile(MineOSCore.paths.applicationList)
local applicationExists = false
for i = 1, #applications do if path == "/" .. applications[i].name then applicationExists = true; break end end
drawErrorWindow(path, errorLine, finalReason, applicationExists)
end
component.gpu.setResolution(oldResolutionWidth, oldResolutionHeight)