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

# Conflicts:
#	Moose Development/Moose/Functional/Range.lua
This commit is contained in:
Applevangelist 2024-05-23 18:13:05 +02:00
commit 64be0ffee5

View File

@ -1226,10 +1226,8 @@ function RANGE:SetSRS(PathToSRS, Port, Coalition, Frequency, Modulation, Volume,
self.instructsrsQ = MSRSQUEUE:New("INSTRUCT") self.instructsrsQ = MSRSQUEUE:New("INSTRUCT")
if PathToGoogleKey then if PathToGoogleKey then
self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey) self.controlmsrs:SetGoogle(PathToGoogleKey)
self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE) self.instructmsrs:SetGoogle(PathToGoogleKey)
self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE)
end end
else else