v1.8.8 - Fixed event.pull() not working when an event type is not specified.
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
local agcfg = {
|
local agcfg = {
|
||||||
["halyde"] = {
|
["halyde"] = {
|
||||||
["maindir"] = "",
|
["maindir"] = "",
|
||||||
["version"] = "1.8.7",
|
["version"] = "1.8.8",
|
||||||
["description"] = "A universal, customizable and feature-packed operating system for OpenComputers.",
|
["description"] = "A universal, customizable and feature-packed operating system for OpenComputers.",
|
||||||
["directories"] = {
|
["directories"] = {
|
||||||
"halyde/apps",
|
"halyde/apps",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ Ahalyde/core/
|
|||||||
Ahalyde/config/generate/
|
Ahalyde/config/generate/
|
||||||
Ahalyde/apps/helpdb/
|
Ahalyde/apps/helpdb/
|
||||||
Ahalyde/apps/
|
Ahalyde/apps/
|
||||||
V1.8.7
|
V1.8.8
|
||||||
Ainit.lua
|
Ainit.lua
|
||||||
Ahalyde/apps/helpdb/cat.txt
|
Ahalyde/apps/helpdb/cat.txt
|
||||||
Ahalyde/apps/helpdb/cd.txt
|
Ahalyde/apps/helpdb/cd.txt
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
local loadfile = ...
|
local loadfile = ...
|
||||||
local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
|
local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
|
||||||
|
|
||||||
_G._OSVERSION = "Halyde 1.8.7"
|
_G._OSVERSION = "Halyde 1.8.8"
|
||||||
_G._OSLOGO = ""
|
_G._OSLOGO = ""
|
||||||
local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
|
local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
|
||||||
repeat
|
repeat
|
||||||
|
|||||||
@@ -20,17 +20,17 @@ function event.pull(...)
|
|||||||
-- Check event queue for matching event
|
-- Check event queue for matching event
|
||||||
for i = 1, #evmgr.eventQueue do
|
for i = 1, #evmgr.eventQueue do
|
||||||
local foundevent = false
|
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
|
if evmgr.eventQueue[i][2] == evtype and evmgr.eventQueue[i][1] >= startTime then
|
||||||
foundevent = true
|
foundevent = true
|
||||||
end
|
end
|
||||||
else -- event type(s) not specified
|
end
|
||||||
|
else
|
||||||
if evmgr.eventQueue[i][1] >= startTime then
|
if evmgr.eventQueue[i][1] >= startTime then
|
||||||
foundevent = true
|
foundevent = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
if foundevent then
|
if foundevent then
|
||||||
-- Found matching event (or any event if no type specified)
|
-- Found matching event (or any event if no type specified)
|
||||||
local result = table.copy(evmgr.eventQueue[i])
|
local result = table.copy(evmgr.eventQueue[i])
|
||||||
|
|||||||
Reference in New Issue
Block a user