From ccbc32238ea9c6abedf3626c11fe51f9c120f9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl?= <danielharkes@gmail.com>
Date: Tue, 14 Nov 2023 21:13:08 +0100
Subject: [PATCH] Properly handle minute offset with negative timezone

---
 addons/markers/functions/fnc_onButtonClickConfirm.sqf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf
index 9aeb7e04c0..942436fc9a 100644
--- a/addons/markers/functions/fnc_onButtonClickConfirm.sqf
+++ b/addons/markers/functions/fnc_onButtonClickConfirm.sqf
@@ -29,8 +29,9 @@ if (cbChecked _aceTimestamp && {ACE_player call FUNC(canTimestamp)}) then {
         };
         case 2: {
             systemTimeUTC params ["", "", "", "_hour", "_min", "_sec"];
-            _hour = _hour + round (GVAR(timestampUTCOffset));
-            _min = _min + GVAR(timestampUTCMinutesOffset);
+            _hourOffset = round (GVAR(timestampUTCOffset));
+            _hour = _hour + _hourOffset;
+            _min = if (_hourOffset < 0) then { _min - GVAR(timestampUTCMinutesOffset) } else { _min + GVAR(timestampUTCMinutesOffset) };
             _time = (_hour + _min/60 + _sec/3600) % 24 + 24;
             _time % 24
         };