Add owner check for vehicle light event

psiberx · Nov 25, 2024 · 411702f · 411702f
1 parent 742c7d3
commit 411702f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/App/Callback/Controllers/VehicleLightControlHook.hpp b/src/App/Callback/Controllers/VehicleLightControlHook.hpp
@@ -33,7 +33,11 @@ class VehicleLightControlHook
 
     inline static void OnToggleLights(Red::vehicleController* aController, bool aEnable, Red::vehicleELightType aLightType)
     {
-        CallbackSystem::Get()->DispatchNativeEvent<VehicleLightControlEvent>(EventName, Red::AsWeakHandle(aController->owner), aEnable, aLightType);
+        auto vehicleEntity = Red::AsWeakHandle(aController->owner);
+        if (vehicleEntity)
+        {
+            CallbackSystem::Get()->DispatchNativeEvent<VehicleLightControlEvent>(EventName, vehicleEntity, aEnable, aLightType);
+        }
     }
 };
 }