Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
funkyfranky committed Nov 15, 2024
2 parents fb2ba1d + dce9631 commit 09e1883
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Moose Development/Moose/Core/Event.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1329,6 +1329,7 @@ function EVENT:onEvent( Event )
end

Event.IniDCSGroupName = Event.IniUnit and Event.IniUnit.GroupName or ""
Event.IniGroupName=Event.IniDCSGroupName --At least set the group name because group might not exist any more
if Event.IniDCSGroup and Event.IniDCSGroup:isExist() then
Event.IniDCSGroupName = Event.IniDCSGroup:getName()
Event.IniGroup = GROUP:FindByName( Event.IniDCSGroupName )
Expand Down
2 changes: 1 addition & 1 deletion Moose Development/Moose/Sound/SRS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ function MSRS:_ExecCommand(command)

elseif self.UsePowerShell == true then

local pwsh = string.format('powershell.exe -ExecutionPolicy Unrestricted -WindowStyle Hidden -Command "%s"',filename)
local pwsh = string.format('start /min "" powershell.exe -ExecutionPolicy Unrestricted -WindowStyle Hidden -Command "%s"',filename)
--env.info("[MSRS] TextToSpeech Command :\n" .. pwsh.."\n")

if string.len(pwsh) > 255 then
Expand Down

0 comments on commit 09e1883

Please sign in to comment.