Make sure explosive is still valid when updating timer

acemod · Sep 13, 2018 · f2a5779 · f2a5779
1 parent bbbfabe
commit f2a5779
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/addons/explosives/functions/fnc_openTimerUI.sqf b/addons/explosives/functions/fnc_openTimerUI.sqf
@@ -61,6 +61,13 @@ _display displayAddEventHandler ["MouseZChanged", {
 [{
     params ["_display", "_pfhID"];
 
+    // Make sure explosive still exists and is near player
+    if ((!isNull _display) && {!alive ACE_player} || {!alive GVAR(explosive)} || {(ACE_player distance GVAR(explosive)) > 5}) exitWith {
+        INFO_2("explosive became invalid",ACE_player,GVAR(explosive));
+        closeDialog 0;
+        _pfhID call CBA_fnc_removePerFrameHandler;
+    };
+
     if (isNull _display) exitWith {
         _pfhID call CBA_fnc_removePerFrameHandler;
     };