mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-23 19:45:29 +00:00
Merge pull request #120 from FlightControl-Master/Detection
Fixed bug in Scheduler
This commit is contained in:
@@ -100,8 +100,11 @@ function SCHEDULER:Start()
|
|||||||
if self.RepeatSecondsInterval ~= 0 then
|
if self.RepeatSecondsInterval ~= 0 then
|
||||||
self.Repeat = true
|
self.Repeat = true
|
||||||
end
|
end
|
||||||
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
|
||||||
|
if self.StartSeconds then
|
||||||
|
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
||||||
|
end
|
||||||
|
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
|
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
|
||||||
env.info( 'Moose Generation Timestamp: 20160723_1650' )
|
env.info( 'Moose Generation Timestamp: 20160723_1722' )
|
||||||
local base = _G
|
local base = _G
|
||||||
|
|
||||||
Include = {}
|
Include = {}
|
||||||
@@ -6370,8 +6370,11 @@ function SCHEDULER:Start()
|
|||||||
if self.RepeatSecondsInterval ~= 0 then
|
if self.RepeatSecondsInterval ~= 0 then
|
||||||
self.Repeat = true
|
self.Repeat = true
|
||||||
end
|
end
|
||||||
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
|
||||||
|
if self.StartSeconds then
|
||||||
|
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
||||||
|
end
|
||||||
|
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -7690,6 +7693,7 @@ do -- MENU_CLIENT
|
|||||||
--
|
--
|
||||||
-- --- @param Client#CLIENT MenuClient
|
-- --- @param Client#CLIENT MenuClient
|
||||||
-- local function AddStatusMenu( MenuClient )
|
-- local function AddStatusMenu( MenuClient )
|
||||||
|
-- env.info(MenuClient.ClientName)
|
||||||
-- local MenuClientName = MenuClient:GetName()
|
-- local MenuClientName = MenuClient:GetName()
|
||||||
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
||||||
-- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )
|
-- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )
|
||||||
@@ -7916,6 +7920,7 @@ do
|
|||||||
--
|
--
|
||||||
-- --- @param Group#GROUP MenuGroup
|
-- --- @param Group#GROUP MenuGroup
|
||||||
-- local function AddStatusMenu( MenuGroup )
|
-- local function AddStatusMenu( MenuGroup )
|
||||||
|
-- env.info(MenuGroup.GroupName)
|
||||||
-- local MenuGroupName = MenuGroup:GetName()
|
-- local MenuGroupName = MenuGroup:GetName()
|
||||||
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
||||||
-- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )
|
-- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
|
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
|
||||||
env.info( 'Moose Generation Timestamp: 20160723_1650' )
|
env.info( 'Moose Generation Timestamp: 20160723_1722' )
|
||||||
local base = _G
|
local base = _G
|
||||||
|
|
||||||
Include = {}
|
Include = {}
|
||||||
@@ -6370,8 +6370,11 @@ function SCHEDULER:Start()
|
|||||||
if self.RepeatSecondsInterval ~= 0 then
|
if self.RepeatSecondsInterval ~= 0 then
|
||||||
self.Repeat = true
|
self.Repeat = true
|
||||||
end
|
end
|
||||||
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
|
||||||
|
if self.StartSeconds then
|
||||||
|
self.ScheduleID = timer.scheduleFunction( self._Scheduler, self, timer.getTime() + self.StartSeconds + .01 )
|
||||||
|
end
|
||||||
|
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -7690,6 +7693,7 @@ do -- MENU_CLIENT
|
|||||||
--
|
--
|
||||||
-- --- @param Client#CLIENT MenuClient
|
-- --- @param Client#CLIENT MenuClient
|
||||||
-- local function AddStatusMenu( MenuClient )
|
-- local function AddStatusMenu( MenuClient )
|
||||||
|
-- env.info(MenuClient.ClientName)
|
||||||
-- local MenuClientName = MenuClient:GetName()
|
-- local MenuClientName = MenuClient:GetName()
|
||||||
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
||||||
-- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )
|
-- MenuStatus[MenuClientName] = MENU_CLIENT:New( MenuClient, "Status for Planes" )
|
||||||
@@ -7916,6 +7920,7 @@ do
|
|||||||
--
|
--
|
||||||
-- --- @param Group#GROUP MenuGroup
|
-- --- @param Group#GROUP MenuGroup
|
||||||
-- local function AddStatusMenu( MenuGroup )
|
-- local function AddStatusMenu( MenuGroup )
|
||||||
|
-- env.info(MenuGroup.GroupName)
|
||||||
-- local MenuGroupName = MenuGroup:GetName()
|
-- local MenuGroupName = MenuGroup:GetName()
|
||||||
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
-- -- This would create a menu for the red coalition under the MenuCoalitionRed menu object.
|
||||||
-- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )
|
-- MenuStatus[MenuGroupName] = MENU_GROUP:New( MenuGroup, "Status for Planes" )
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user