From 03b8e2b590662547374a948efdde947fa4362c2a Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 28 Feb 2016 06:12:40 +0100
Subject: [PATCH] fix reloadMutex nil, fix#3450

---
 addons/common/CfgEventHandlers.hpp                           | 2 +-
 .../{XEH_mainDislayLoad.sqf => XEH_missionDislayLoad.sqf}    | 2 --
 addons/common/functions/fnc_handleScrollWheel.sqf            | 5 -----
 addons/gestures/CfgEventHandlers.hpp                         | 2 +-
 .../{XEH_mainDislayLoad.sqf => XEH_missionDislayLoad.sqf}    | 3 ---
 addons/gestures/XEH_postInit.sqf                             | 3 +++
 6 files changed, 5 insertions(+), 12 deletions(-)
 rename addons/common/{XEH_mainDislayLoad.sqf => XEH_missionDislayLoad.sqf} (74%)
 rename addons/gestures/{XEH_mainDislayLoad.sqf => XEH_missionDislayLoad.sqf} (93%)

diff --git a/addons/common/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp
index bdfeccd4fa..a9641448c1 100644
--- a/addons/common/CfgEventHandlers.hpp
+++ b/addons/common/CfgEventHandlers.hpp
@@ -21,7 +21,7 @@ class Extended_PostInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMission {
-        ADDON = QUOTE(_this call COMPILE_FILE(XEH_mainDislayLoad));
+        ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDislayLoad));
     };
 };
 
diff --git a/addons/common/XEH_mainDislayLoad.sqf b/addons/common/XEH_missionDislayLoad.sqf
similarity index 74%
rename from addons/common/XEH_mainDislayLoad.sqf
rename to addons/common/XEH_missionDislayLoad.sqf
index 57ace32f94..a07c301288 100644
--- a/addons/common/XEH_mainDislayLoad.sqf
+++ b/addons/common/XEH_missionDislayLoad.sqf
@@ -1,6 +1,4 @@
 #include "script_component.hpp"
 
-GVAR(ScrollWheelFrame) = diag_frameno;
-
 call COMPILE_FILE(init_handleScrollWheel);
 call COMPILE_FILE(init_handleModifierKey);
diff --git a/addons/common/functions/fnc_handleScrollWheel.sqf b/addons/common/functions/fnc_handleScrollWheel.sqf
index c0b88f9ed7..037b7b640b 100644
--- a/addons/common/functions/fnc_handleScrollWheel.sqf
+++ b/addons/common/functions/fnc_handleScrollWheel.sqf
@@ -12,11 +12,6 @@
  */
 #include "script_component.hpp"
 
-// prevents a bug that causes the MouseZChanged to trigger N-times, where N is the number of times you consecutively pressed "Restart" instead of "Preview" in the editor
-if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {};
-
-GVAR(ScrollWheelFrame) = diag_frameno;
-
 {
     [_this select 1] call _x;
     false
diff --git a/addons/gestures/CfgEventHandlers.hpp b/addons/gestures/CfgEventHandlers.hpp
index e2b5ef729b..738195ad50 100644
--- a/addons/gestures/CfgEventHandlers.hpp
+++ b/addons/gestures/CfgEventHandlers.hpp
@@ -19,6 +19,6 @@ class Extended_PostInit_EventHandlers {
 
 class Extended_DisplayLoad_EventHandlers {
     class RscDisplayMission {
-        ADDON = QUOTE(_this call COMPILE_FILE(XEH_mainDislayLoad));
+        ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDislayLoad));
     };
 };
diff --git a/addons/gestures/XEH_mainDislayLoad.sqf b/addons/gestures/XEH_missionDislayLoad.sqf
similarity index 93%
rename from addons/gestures/XEH_mainDislayLoad.sqf
rename to addons/gestures/XEH_missionDislayLoad.sqf
index 4b5c2ca63b..17ddf32557 100644
--- a/addons/gestures/XEH_mainDislayLoad.sqf
+++ b/addons/gestures/XEH_missionDislayLoad.sqf
@@ -4,9 +4,6 @@ disableSerialization;
 
 params ["_display"];
 
-// reload mutex, you can't play signal while reloading
-GVAR(ReloadMutex) = true;
-
 _display displayAddEventHandler ["KeyDown", {
     if ((_this select 1) in actionKeys "ReloadMagazine") then {
         if (isNull ACE_player || {!alive ACE_player}) exitWith {false};
diff --git a/addons/gestures/XEH_postInit.sqf b/addons/gestures/XEH_postInit.sqf
index d9cfc74e04..3b4a92164e 100644
--- a/addons/gestures/XEH_postInit.sqf
+++ b/addons/gestures/XEH_postInit.sqf
@@ -2,4 +2,7 @@
 
 if (!hasInterface) exitWith {};
 
+// reload mutex, you can't play signal while reloading
+GVAR(ReloadMutex) = true;
+
 #include "key.sqf"