diff --git a/argentum.cfg b/argentum.cfg index 344e30c..bf0772c 100644 --- a/argentum.cfg +++ b/argentum.cfg @@ -1,7 +1,7 @@ local agcfg = { ["halyde"] = { ["maindir"] = "", - ["version"] = "1.8.7", + ["version"] = "1.8.8", ["description"] = "A universal, customizable and feature-packed operating system for OpenComputers.", ["directories"] = { "halyde/apps", diff --git a/argentum/store/halyde/package.cfg b/argentum/store/halyde/package.cfg index 99456ec..15383dd 100644 --- a/argentum/store/halyde/package.cfg +++ b/argentum/store/halyde/package.cfg @@ -4,7 +4,7 @@ Ahalyde/core/ Ahalyde/config/generate/ Ahalyde/apps/helpdb/ Ahalyde/apps/ -V1.8.7 +V1.8.8 Ainit.lua Ahalyde/apps/helpdb/cat.txt Ahalyde/apps/helpdb/cd.txt diff --git a/halyde/core/boot.lua b/halyde/core/boot.lua index d451fed..e3fb84c 100644 --- a/halyde/core/boot.lua +++ b/halyde/core/boot.lua @@ -1,7 +1,7 @@ local loadfile = ... local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile) -_G._OSVERSION = "Halyde 1.8.7" +_G._OSVERSION = "Halyde 1.8.8" _G._OSLOGO = "" local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil repeat diff --git a/halyde/lib/event.lua b/halyde/lib/event.lua index 70b18fd..9c11d23 100644 --- a/halyde/lib/event.lua +++ b/halyde/lib/event.lua @@ -20,15 +20,15 @@ function event.pull(...) -- Check event queue for matching event for i = 1, #evmgr.eventQueue do local foundevent = false - for _, evtype in pairs(evtypes) do - if evtypes[1] then -- event type(s) specified + if evtypes[1] then -- event type(s) specified + for _, evtype in pairs(evtypes) do if evmgr.eventQueue[i][2] == evtype and evmgr.eventQueue[i][1] >= startTime then foundevent = true end - else -- event type(s) not specified - if evmgr.eventQueue[i][1] >= startTime then - foundevent = true - end + end + else + if evmgr.eventQueue[i][1] >= startTime then + foundevent = true end end if foundevent then