mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-08-15 10:47:21 +00:00
Merge pull request #1 from svenvandevelde/Fix-Client-not-found-bug
Avoid a crash when ReturnGroup is null
This commit is contained in:
commit
0aae73ef58
@ -68,9 +68,9 @@ end
|
|||||||
-- @treturn Group
|
-- @treturn Group
|
||||||
function CLIENT:ClientGroup()
|
function CLIENT:ClientGroup()
|
||||||
--trace.f(self.ClassName)
|
--trace.f(self.ClassName)
|
||||||
local GroupExists = Group.getByName( self.ClientName )
|
local ReturnGroup = Group.getByName( self.ClientName )
|
||||||
if GroupExists::isExist() then
|
if ReturnGroup and ReturnGroup:isExist() then
|
||||||
return GroupExists
|
return ReturnGroup
|
||||||
else
|
else
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|||||||
39
MissionScripting/MissionScripting.lua
Normal file
39
MissionScripting/MissionScripting.lua
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
--Initialization script for the Mission lua Environment (SSE)
|
||||||
|
|
||||||
|
dofile('Scripts/ScriptingSystem.lua')
|
||||||
|
|
||||||
|
Include = {}
|
||||||
|
|
||||||
|
Include.LoadPath = 'Scripts/MOOSE'
|
||||||
|
Include.Files = {}
|
||||||
|
|
||||||
|
Include.File = function( IncludeFile )
|
||||||
|
if not Include.Files[ IncludeFile ] then
|
||||||
|
Include.Files[IncludeFile] = IncludeFile
|
||||||
|
dofile( Include.LoadPath .. "/" .. IncludeFile .. ".lua" )
|
||||||
|
env.info( "Include:" .. IncludeFile .. " loaded." )
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
Include.File( "Trace" )
|
||||||
|
Include.File( "Routines" )
|
||||||
|
Include.File( "Database" )
|
||||||
|
Include.File( "StatHandler" )
|
||||||
|
|
||||||
|
--Sanitize Mission Scripting environment
|
||||||
|
--This makes unavailable some unsecure functions.
|
||||||
|
--Mission downloaded from server to client may contain potentialy harmful lua code that may use these functions.
|
||||||
|
--You can remove the code below and make availble these functions at your own risk.
|
||||||
|
|
||||||
|
local function sanitizeModule(name)
|
||||||
|
_G[name] = nil
|
||||||
|
package.loaded[name] = nil
|
||||||
|
end
|
||||||
|
|
||||||
|
do
|
||||||
|
--sanitizeModule('os')
|
||||||
|
--sanitizeModule('io')
|
||||||
|
sanitizeModule('lfs')
|
||||||
|
require = nil
|
||||||
|
loadlib = nil
|
||||||
|
end
|
||||||
Loading…
x
Reference in New Issue
Block a user