Merge pull request acemod#6703 from acemod/fix-moving-marker-synch

fix moved markers not synched
classicarma · Nov 25, 2018 · a89dfcc · a89dfcc
2 parents a357675 + d0bbc11
commit a89dfcc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/addons/markers/functions/fnc_movePFH.sqf b/addons/markers/functions/fnc_movePFH.sqf
@@ -22,8 +22,9 @@ if (isNull _ctrlMap || !GVAR(moving)) exitWith {
     (_this select 1) call CBA_fnc_removePerFrameHandler;
 
     private _finalPos = getMarkerPos _marker;
+    private _overrule = [QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent;
 
-    if !([QGVAR(markerMoveEnded), [ACE_player, _marker, _originalPos, _finalPos]] call CBA_fnc_localEvent) then {
+    if (!isNil "_overrule" && {_overrule isEqualTo true}) then {
         _marker setMarkerPosLocal _originalPos;
     } else {
         [QGVAR(setMarkerPosLocal), [_marker, _finalPos]] call CBA_fnc_globalEvent;