Skip to content

Commit 705ec65

Browse files
committed
Fix null pointer when saving selectors
1 parent ac836f1 commit 705ec65

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PantographSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ public void InitializeMoving()
146146

147147
public void Save(BinaryWriter outf)
148148
{
149-
outf.Write(Position?.Name);
149+
outf.Write(Position?.Name ?? string.Empty);
150150
}
151151

152152
public void Restore(BinaryReader inf)
153153
{
154154
string name = inf.ReadString();
155-
Position = Positions.FirstOrDefault(x => x.Name == name) ?? Positions.FirstOrDefault();
155+
Position = Positions.FirstOrDefault(x => x.Name == name);
156156
}
157157

158158
public void Update(float elapsedClockSeconds)

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/PowerLimitationSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ public void InitializeMoving()
148148

149149
public void Save(BinaryWriter outf)
150150
{
151-
outf.Write(Position?.Name);
151+
outf.Write(Position?.Name ?? string.Empty);
152152
}
153153

154154
public void Restore(BinaryReader inf)
155155
{
156156
string name = inf.ReadString();
157-
Position = Positions.FirstOrDefault(x => x.Name == name) ?? Positions.FirstOrDefault();
157+
Position = Positions.FirstOrDefault(x => x.Name == name);
158158
}
159159

160160
public void Update(float elapsedClockSeconds)

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/Controllers/VoltageSelector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ public void InitializeMoving()
149149

150150
public void Save(BinaryWriter outf)
151151
{
152-
outf.Write(Position?.Name);
152+
outf.Write(Position?.Name ?? string.Empty);
153153
}
154154

155155
public void Restore(BinaryReader inf)
156156
{
157157
string name = inf.ReadString();
158-
Position = Positions.FirstOrDefault(x => x.Name == name) ?? Positions.FirstOrDefault();
158+
Position = Positions.FirstOrDefault(x => x.Name == name);
159159
}
160160

161161
public void Update(float elapsedClockSeconds)

0 commit comments

Comments
 (0)