From 64c7afed1497a572c8c219bd8c9f54b89623c424 Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Tue, 22 Sep 2020 14:24:07 -0600
Subject: [PATCH] Added loop to ensure driver is deleted before the vehicle is
 deleted upon dismiss from world

---
 SceneManager/Menus/PathMainMenu.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/SceneManager/Menus/PathMainMenu.cs b/SceneManager/Menus/PathMainMenu.cs
index ba94194..e4623b8 100644
--- a/SceneManager/Menus/PathMainMenu.cs
+++ b/SceneManager/Menus/PathMainMenu.cs
@@ -303,7 +303,16 @@ namespace SceneManager
                     else if(dismissDriver.Index == (int)DismissOption.FromWorld)
                     {
                         Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world");
-                        nearbyVehicle.Driver.Delete();
+                        if (nearbyVehicle.HasDriver)
+                        {
+                            while (nearbyVehicle.Driver)
+                            {
+                                nearbyVehicle.Driver.Dismiss();
+                                nearbyVehicle.Driver.Delete();
+                                GameFiber.Yield();
+                            }
+                        }
+
                         nearbyVehicle.Delete(); 
                     }
                 }