Skip to content

Commit 8bf0fe4

Browse files
committed
fix crash with non-building objects breaking in building component viewer
1 parent db36335 commit 8bf0fe4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Gui/ViewModels/LocoTypes/ObjectEditorViewModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Definitions.ObjectModels;
99
using Definitions.ObjectModels.Objects.Common;
1010
using Definitions.ObjectModels.Objects.Sound;
11+
using Definitions.ObjectModels.Types;
1112
using Gui.Models;
1213
using Gui.Models.Audio;
1314
using Gui.ViewModels.Graphics;
@@ -262,7 +263,8 @@ public override void Load()
262263
}
263264
else
264265
{
265-
ExtraContentViewModel = new ImageTableViewModel(CurrentObject.LocoObject.ImageTable, Model.Logger, (CurrentObject.LocoObject.Object as IHasBuildingComponents)?.BuildingComponents);
266+
var bc = CurrentObject.LocoObject.ObjectType == ObjectType.Building ? (CurrentObject.LocoObject.Object as IHasBuildingComponents)?.BuildingComponents : null;
267+
ExtraContentViewModel = new ImageTableViewModel(CurrentObject.LocoObject.ImageTable, Model.Logger, bc);
266268
}
267269
}
268270
}

0 commit comments

Comments
 (0)