FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with SchedulerObject in BASE. This caused conflicts in SPAWN and SCHEDULER.

Browse Source
This commit is contained in:
FlightControl_Master
2017-12-09 13:28:08 +01:00
parent 5eeafd2fba
commit 3135639557
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Moose Development/Moose/Core/Base.lua
View File

@@ -199,6 +199,7 @@ BASE = {
Events = {},
States = {},
Debug = debug,
Scheduler = nil,
}
@@ -706,10 +707,15 @@ do -- Scheduling
ObjectName = self.ClassName .. self.ClassID
self:F3( { "ScheduleOnce: ", ObjectName, Start } )
self.SchedulerObject = self
if not self.Scheduler then
self.Scheduler = SCHEDULER:New( self )
end
self.Scheduler.SchedulerObject = self.Scheduler
local ScheduleID = _SCHEDULEDISPATCHER:AddSchedule(
self,
self.Scheduler,
SchedulerFunction,
{ ... },
Start,
@@ -740,10 +746,15 @@ do -- Scheduling
ObjectName = self.ClassName .. self.ClassID
self:F3( { "ScheduleRepeat: ", ObjectName, Start, Repeat, RandomizeFactor, Stop } )
self.SchedulerObject = self
if not self.Scheduler then
self.Scheduler = SCHEDULER:New( self )
end
self.Scheduler.SchedulerObject = self.Scheduler
local ScheduleID = _SCHEDULEDISPATCHER:AddSchedule(
self,
self.Scheduler,
SchedulerFunction,
{ ... },
Start,
@@ -764,7 +775,7 @@ do -- Scheduling
self:F3( { "ScheduleStop:" } )
_SCHEDULEDISPATCHER:Stop( self, self._.Schedules[SchedulerFunction] )
_SCHEDULEDISPATCHER:Stop( self.Scheduler, self._.Schedules[SchedulerFunction] )
end
end