tidy up sync/async in saving objects

Author: LeftofZen

AvaGui/Models/UiLocoFile.cs

@@ -6,24 +6,7 @@ namespace AvaGui.Models
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	public class UiLocoFile : IUiObject
 	{
-		public DatFileInfo DatFileInfo { get; set; }
-		public ILocoObject LocoObject { get; set; }
+		public DatFileInfo? DatFileInfo { get; set; }
+		public ILocoObject? LocoObject { get; set; }
 	}
-
-	//[TypeConverter(typeof(ExpandableObjectConverter))]
-	//public class UILocoObject
-	//{
-	//	public UILocoObject(ILocoStruct @struct, StringTable stringTable, BindingList<G1Element32> g1Elements)
-	//	{
-	//		Struct = @struct;
-	//		StringTable = stringTable;
-	//		G1Elements = g1Elements;
-	//	}
-
-	//	public ILocoStruct Struct { get; set; }
-	//	public StringTable StringTable { get; set; }
-
-	//	[TypeConverter(typeof(TypeListConverter))]
-	//	public BindingList<G1Element32> G1Elements { get; set; }
-	//}
 }

AvaGui/ViewModels/DatTypes/ObjectEditorViewModel.cs

@@ -14,7 +14,7 @@ public class ObjectEditorViewModel : ReactiveObject, ILocoFileViewModel
 	{
 		public ReactiveCommand<Unit, Unit> ReloadObjectCommand { get; init; }
 		public ReactiveCommand<Unit, Unit> SaveObjectCommand { get; init; }
-		public ReactiveCommand<Unit, Task> SaveAsObjectCommand { get; init; }
+		public ReactiveCommand<Unit, Unit> SaveAsObjectCommand { get; init; }
 
 		[Reactive]
 		public StringTableViewModel? StringTableViewModel { get; set; }
@@ -77,7 +77,13 @@ public void ReloadCurrentObject()
 			{
 				CurrentObject = newObj;
 			}
+			else
+			{
+				// todo: show warnings here
+				CurrentObject = null;
+			}
 		}
+
 		public void SaveCurrentObject()
 		{
 			if (CurrentObject?.LocoObject == null)
@@ -90,9 +96,9 @@ public void SaveCurrentObject()
 			SawyerStreamWriter.Save(CurrentFile.Path, CurrentObject.DatFileInfo.S5Header.Name, CurrentObject.LocoObject);
 		}
 
-		public async Task SaveAsCurrentObject()
+		public void SaveAsCurrentObject()
 		{
-			var saveFile = await PlatformSpecific.SaveFilePicker();
+			var saveFile = Task.Run(PlatformSpecific.SaveFilePicker).Result;
 			if (saveFile == null)
 			{
 				return;