From 192e4d14bbf10965975a5e45fa2cafed4bcf0ab8 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Wed, 10 Apr 2024 21:27:17 +0200
Subject: [PATCH] Move keybinds

---
 addons/scopes/XEH_postInit.sqf              | 6 +++---
 addons/scopes/functions/fnc_adjustScope.sqf | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 84df608026e..4ce8d6d11ce 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -9,6 +9,9 @@
 
 if (!hasInterface) exitWith {};
 
+// Add keybinds
+#include "initKeybinds.inc.sqf"
+
 GVAR(Optics) = ["", "", ""];
 GVAR(Guns) = ["", "", ""];
 GVAR(canAdjustElevation) = [false, false, false];
@@ -41,9 +44,6 @@ GVAR(scopeAdjust) = [[[0,0],0,[0,0],0], [[0,0],0,[0,0],0], [[0,0],0,[0,0],0]];
         };
     }] call CBA_fnc_addPlayerEventHandler;
 
-    // Add keybinds
-    #include "initKeybinds.inc.sqf"
-
     // Register fire event handler
     ["ace_firedPlayer", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
     ["ace_firedPlayerNonLocal", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
diff --git a/addons/scopes/functions/fnc_adjustScope.sqf b/addons/scopes/functions/fnc_adjustScope.sqf
index bd2d2d1da67..0a9d7bd089b 100644
--- a/addons/scopes/functions/fnc_adjustScope.sqf
+++ b/addons/scopes/functions/fnc_adjustScope.sqf
@@ -17,12 +17,13 @@
  * Public: No
  */
 
+if (!GVAR(enabled)) exitWith {false};
+
 params ["_unit", "_turretAndDirection", "_majorStep"];
 TRACE_3("adjustScope",_unit,_turretAndDirection,_majorStep);
 
 if (!(_unit isKindOf "Man")) exitWith {false};
 if (currentMuzzle _unit != currentWeapon _unit) exitWith {false};
-if (!GVAR(enabled)) exitWith {false};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
 if (_weaponIndex < 0) exitWith {false};