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

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Sound/SRS.lua
This commit is contained in:
Applevangelist
2023-11-24 08:58:23 +01:00
parent 9eb05fa447 cac7b39823
commit 7978bbc612
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Moose Development/Moose/Sound/SRS.lua
View File

@@ -1216,12 +1216,10 @@ end
-- --Start ATIS
-- atis:Start()
function MSRS:LoadConfigFile(Path,Filename)
if not lfs then
env.info("MSRS - Config load, lfs is not available!",false)
return
end
if not os then
env.info("MSRS - Config load, os is not available!",false)
if lfs == nil then
env.info("*****Note - lfs and os need to be desanitized for MSRS to work!")
return false
end
local path = Path or lfs.writedir()..MSRS.ConfigFilePath
local file = Filename or MSRS.ConfigFileName or "Moose_MSRS.lua"