fix rackrail in vehicle viewmodel

Author: LeftofZen

Gui/ViewModels/LocoTypes/Objects/VehicleViewModel.cs

@@ -35,16 +35,11 @@ public VehicleViewModel(VehicleObject model) : base(model)
 		RoadOrTrackType = model.RoadOrTrackType;
 		RackRail = model.RackRail;
 
-		HasRackRail = model.Flags.HasFlag(VehicleObjectFlags.RackRail);
-
 		SimpleMotorSound = model.SimpleMotorSound ?? new SimpleMotorSound();
 		FrictionSound = model.FrictionSound ?? new FrictionSound();
 		GearboxMotorSound = model.GearboxMotorSound ?? new GearboxMotorSound();
 		Sound = model.Sound;
 
-		_ = this.WhenAnyValue(x => x.RackRail)
-			.Subscribe((_) => model.RackRail = RackRail);
-
 		#region Road/Track Type Binding
 
 		_ = this.WhenAnyValue(x => x.Mode, x => x.Flags)
@@ -53,9 +48,6 @@ public VehicleViewModel(VehicleObject model) : base(model)
 		_ = this.WhenAnyValue(x => x.IsTrackTypeSettable)
 			.Subscribe((_) => this.RaisePropertyChanged(nameof(RoadOrTrackType)));
 
-		_ = this.WhenAnyValue(x => x.RoadOrTrackType)
-			.Subscribe((_) => model.RoadOrTrackType = RoadOrTrackType);
-
 		#endregion
 
 		#region Sound Properties Binding
@@ -165,10 +157,13 @@ public VehicleObjectFlags Flags
 	bool IsTrackTypeSettable
 		=> !model.Flags.HasFlag(VehicleObjectFlags.AnyRoadType) && (model.Mode == TransportMode.Rail || model.Mode == TransportMode.Road);
 
-	[Reactive]
 	[ConditionTarget]
 	[PropertyVisibilityCondition(nameof(IsTrackTypeSettable), true)]
-	public ObjectModelHeader? RoadOrTrackType { get; set; }
+	public ObjectModelHeader? RoadOrTrackType
+	{
+		get => model.RoadOrTrackType;
+		set => model.RoadOrTrackType = value;
+	}
 
 	[ConditionTarget]
 	public bool HasRackRail
@@ -177,16 +172,23 @@ public bool HasRackRail
 		set
 		{
 			model.Flags = model.Flags.ToggleFlag(VehicleObjectFlags.RackRail, value);
-			RackRail = value && RackRail == null
-				? new ObjectModelHeader("<obj>", ObjectType.TrackExtra, ObjectSource.OpenLoco, 0)
-				: null;
+
+			if (RackRail == null && model.Flags.HasFlag(VehicleObjectFlags.RackRail))
+			{
+				RackRail = new ObjectModelHeader() { Name = "<obj>", ObjectSource = ObjectSource.Custom, ObjectType = ObjectType.TrackExtra };
+			}
+
+			this.RaisePropertyChanged(nameof(RackRail));
 		}
 	}
 
-	[Reactive]
 	[ConditionTarget]
 	[PropertyVisibilityCondition(nameof(HasRackRail), true)]
-	public ObjectModelHeader? RackRail { get; set; }
+	public ObjectModelHeader? RackRail
+	{
+		get => model.RackRail;
+		set => model.RackRail = value;
+	}
 
 	[Range(0, 4)]
 	public uint8_t NumCarComponents

Gui/version.txt

@@ -1 +1 @@
-5.5.4
+5.5.5