Merge pull request #409 from Csantucci/fix-dynamic-weather Bug fix for https://bugs.launchpad.net/or/+bug/1927811 Dynamic weather not working

Csantucci · web-flow · commit d7fc6f445a4d · 2021-05-17T10:50:40.000+02:00
diff --git a/Source/RunActivity/Viewer3D/Weather.cs b/Source/RunActivity/Viewer3D/Weather.cs
@@ -517,8 +517,7 @@ public virtual void Update(ElapsedTime elapsedTime)
                 {
                     dynamicWeather = new DynamicWeather();
                 }
-                var weatherChange = Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange != null ?
-                    Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange : Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.ORTSWeatherChange;
+                var weatherChange = Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.ORTSWeatherChange ?? Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange;
                 dynamicWeather.WeatherChange_Init(weatherChange, this);
                 Program.Simulator.ActivityRun.triggeredEventWrapper = null;               
             }

Original file line number	Diff line number	Diff line change
`@@ -517,8 +517,7 @@ public virtual void Update(ElapsedTime elapsedTime)`
`517`	`517`	`{`
`518`	`518`	`dynamicWeather = new DynamicWeather();`
`519`	`519`	`}`
`520`		`- var weatherChange = Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange != null ?`
`521`		`- Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange : Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.ORTSWeatherChange;`
	`520`	`+ var weatherChange = Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.ORTSWeatherChange ?? Program.Simulator.ActivityRun.triggeredEventWrapper.ParsedObject.Outcomes.ORTSWeatherChange;`
`522`	`521`	`dynamicWeather.WeatherChange_Init(weatherChange, this);`
`523`	`522`	`Program.Simulator.ActivityRun.triggeredEventWrapper = null;`
`524`	`523`	`}`