Merge branch 'master' into feature/gsx-integration

flybywiresim · Jan 17, 2023 · c2e6ff5 · c2e6ff5
2 parents f11b2b8 + 986fd65
commit c2e6ff5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/fmgc/src/flightplanning/LegsProcedure.ts b/src/fmgc/src/flightplanning/LegsProcedure.ts
@@ -280,7 +280,7 @@ export class LegsProcedure {
       // find a leg with the reference navaid for the procedure
           for (let i = this._legs.length - 1; i >= 0; i--) {
               if (this._legs[i].originIcao.trim().length > 0) {
-                  const recNavaid: RawVor = this.getLoadedFacility(currentLeg.originIcao) as RawVor;
+                  const recNavaid: RawVor = this.getLoadedFacility(this._legs[i].originIcao) as RawVor;
                   if (recNavaid && recNavaid.magneticVariation !== undefined) {
                       return 360 - recNavaid.magneticVariation;
                   }

diff --git a/src/systems/a380_systems/src/navigation.rs b/src/systems/a380_systems/src/navigation.rs
@@ -54,7 +54,7 @@ impl A380RadioAltimeters {
             radio_altimeter_3: A380RadioAltimeter::new(
                 context,
                 3,
-                ElectricalBusType::AlternatingCurrent(2),
+                ElectricalBusType::AlternatingCurrentEssential,
                 AntennaInstallation::new(
                     Length::new::<foot>(14.75) - Length::new::<meter>(4.27),
                     Length::new::<meter>(15.90),