Merge pull request #1292 from AsgardXIV/briofailfix

Do not crash when Brio call fails
imchillin · Feb 14, 2023 · fcc5f38 · fcc5f38
2 parents f110da6 + 9567e36
commit fcc5f38
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 27 deletions.
diff --git a/Anamnesis/MainWindow.xaml.cs b/Anamnesis/MainWindow.xaml.cs
@@ -25,6 +25,7 @@ namespace Anamnesis.GUI;
 using XivToolsWpf;
 using XivToolsWpf.Windows;
 using XivToolsWpf.Extensions;
+using Serilog;
 
 /// <summary>
 /// Interaction logic for MainWindow.xaml.
@@ -326,9 +327,16 @@ private async void OnDespawnActorClicked(object sender, RoutedEventArgs e)
 			if (!actor.IsValid || actor.Memory == null)
 				return;
 
-			if(await Brio.Brio.Despawn(actor.Memory.ObjectIndex))
+			try
 			{
-				TargetService.UnpinActor(actor);
+				if (await Brio.Brio.Despawn(actor.Memory.ObjectIndex))
+				{
+					TargetService.UnpinActor(actor);
+				}
+			}
+			catch(Exception ex)
+			{
+				Log.Error("Failed to despawn actor", ex);
 			}
 		}
 	}

diff --git a/Anamnesis/Views/TargetSelectorView.xaml.cs b/Anamnesis/Views/TargetSelectorView.xaml.cs
@@ -15,6 +15,7 @@ namespace Anamnesis.Views;
 using Anamnesis.Memory;
 using Anamnesis.Services;
 using Anamnesis.Styles.Drawers;
+using Serilog;
 using XivToolsWpf;
 
 public abstract class TargetSelectorDrawer : SelectorDrawer<ActorBasicMemory>
@@ -186,37 +187,48 @@ private async void OnCreateActorClicked(object sender, RoutedEventArgs e)
 		if (PoseService.Instance.IsEnabled || PoseService.Instance.FreezeWorldPosition)
 			options |= SpawnOptions.ApplyModelPosition;
 
-		var nextActorId = await Brio.Spawn(options);
-		if(nextActorId != -1)
+		try
 		{
-			var actors = ActorService.Instance.GetAllActors(true);
-			var newActor = actors.SingleOrDefault(i => i.ObjectIndex == nextActorId);
-			if(newActor != null)
+			var nextActorId = await Brio.Spawn(options);
+			if (nextActorId != -1)
 			{
-				if (PoseService.Instance.IsEnabled)
+				var actors = ActorService.Instance.GetAllActors(true);
+				var newActor = actors.SingleOrDefault(i => i.ObjectIndex == nextActorId);
+				if (newActor != null)
 				{
-					// We try and load the A-Pose if it's available
-					var path = FileService.ParseToFilePath(FileService.StandardPoseDirectory.Path);
-					path = path + Path.Combine("Unisex", "A-Pose.pose");
-
-					if (File.Exists(path))
+					if (PoseService.Instance.IsEnabled)
 					{
-						PoseFile? poseFile = new PoseFile().Deserialize(File.OpenRead(path)) as PoseFile;
-						if (poseFile == null)
-							return;
-
-						SkeletonVisual3d skeletonVisual3D = new();
-						ActorMemory fullActor = new ActorMemory();
-						fullActor.SetAddress(newActor.Address);
-						fullActor.Tick();
-						await skeletonVisual3D.SetActor(fullActor);
-						await poseFile.Apply(fullActor, skeletonVisual3D, null, PoseFile.Mode.Rotation);
-				}
+						// We try and load the A-Pose if it's available
+						var path = FileService.ParseToFilePath(FileService.StandardPoseDirectory.Path);
+						path = path + Path.Combine("Unisex", "A-Pose.pose");
+
+						if (File.Exists(path))
+						{
+							PoseFile? poseFile = new PoseFile().Deserialize(File.OpenRead(path)) as PoseFile;
+							if (poseFile == null)
+								return;
+
+							SkeletonVisual3d skeletonVisual3D = new();
+							ActorMemory fullActor = new ActorMemory();
+							fullActor.SetAddress(newActor.Address);
+							fullActor.Tick();
+							await skeletonVisual3D.SetActor(fullActor);
+							await poseFile.Apply(fullActor, skeletonVisual3D, null, PoseFile.Mode.Rotation);
+						}
+					}
+
+					this.Value = newActor;
+					this.OnSelectionChanged(true);
 				}
-
-				this.Value = newActor;
-				this.OnSelectionChanged(true);
 			}
+			else
+			{
+				throw new Exception("Brio could not spawn actor");
+			}
+		}
+		catch(Exception ex)
+		{
+			Log.Error("Failed to spawn actor", ex);
 		}
 	}
 }