From cc96e8d185c8f8c00c69c6c6048e9c43ecb3c972 Mon Sep 17 00:00:00 2001 From: Ale32bit Date: Sun, 27 Mar 2016 12:50:52 +0200 Subject: [PATCH] Update sPhone.lua --- src/sPhone.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/sPhone.lua b/src/sPhone.lua index 77b0de5..349de86 100644 --- a/src/sPhone.lua +++ b/src/sPhone.lua @@ -510,27 +510,24 @@ end sPhone.colourPicker = sPhone.colorPicker -- For UK - function sPhone.run(_rApp) - if not fs.exists(_rApp) or fs.isDir(_rApp) then + function sPhone.run(rApp, ...) + if not fs.exists(rApp) or fs.isDir(rApp) then sPhone.winOk("App not found") - return + return false end - local f = fs.open(_rApp, "r") - local script = f.readAll() - f.close() if sPhone.inHome then local sPhoneWasInHome = true sPhone.inHome = false end os.pullEvent = os.oldPullEvent - local ok, err = pcall(function() setfenv(loadstring(script),getfenv())() end) + local ok, err = pcall(function() setfenv(loadfile(rApp),getfenv())() end) if not ok then os.pullEvent = os.pullEventRaw term.setBackgroundColor(colors.white) term.setTextColor(colors.black) term.clear() term.setCursorPos(1,2) - visum.align("center"," "..fs.getName(_rApp).." crashed",false,2) + visum.align("center"," "..fs.getName(rApp).." crashed",false,2) term.setCursorPos(1,4) print(err) print("")