From 5d1a17ed1fdd3ff8658a816de50a9aaf880a5894 Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Sat, 10 Oct 2020 20:08:59 -0600
Subject: [PATCH] Added new DismissOption enum for when a player enters a
 collected vehicle.  Added null checking when deleting nearby vehicle from
 world.

---
 SceneManager/Menus/PathMainMenu.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/SceneManager/Menus/PathMainMenu.cs b/SceneManager/Menus/PathMainMenu.cs
index f48a7e8..e53bb33 100644
--- a/SceneManager/Menus/PathMainMenu.cs
+++ b/SceneManager/Menus/PathMainMenu.cs
@@ -13,7 +13,8 @@ namespace SceneManager
         FromPath = 0,
         FromWaypoint = 1,
         FromWorld = 2,
-        FromDirect = 3
+        FromDirect = 3,
+        FromPlayer = 4
     }
 
     static class PathMainMenu
@@ -296,17 +297,18 @@ namespace SceneManager
                     else if(dismissDriver.Index == (int)DismissOption.FromWorld)
                     {
                         Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world");
-                        while (nearbyVehicle.HasOccupants)
+                        while (nearbyVehicle && nearbyVehicle.HasOccupants)
                         {
                             foreach (Ped occupant in nearbyVehicle.Occupants)
                             {
-                                occupant.Dismiss();
                                 occupant.Delete();
                             }
                             GameFiber.Yield();
                         }
-
-                        nearbyVehicle.Delete(); 
+                        if (nearbyVehicle)
+                        {
+                            nearbyVehicle.Delete();
+                        }
                     }
                 }
             }