Merge pull request #1254 from mharis001/optics-curator

Fix optics camera restart handling for Zeus
CBATeam · Nov 16, 2019 · 70563e9 · 70563e9
2 parents c73f3c8 + 83e276c
commit 70563e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/addons/optics/fnc_restartCamera.sqf b/addons/optics/fnc_restartCamera.sqf
@@ -21,9 +21,12 @@ Author:
     commy2
 ---------------------------------------------------------------------------- */
 
-if (!GVAR(usePipOptics)) exitWith {};
-if (configProperties [configFile >> "CBA_PIPItems"] isEqualTo []) exitWith {};
-if (isNull (uiNamespace getVariable ["RscDisplayMission", displayNull])) exitWith {};
+if (
+    !GVAR(usePipOptics)
+    || {configProperties [configFile >> "CBA_PIPItems"] isEqualTo []}
+    || {isNull (uiNamespace getVariable ["RscDisplayMission", displayNull])}
+    || {!isNull (uiNamespace getVariable ["RscDisplayCurator", displayNull])}
+) exitWith {};
 
 params ["_unit", ["_reset", true]];
 

diff --git a/addons/optics/script_component.hpp b/addons/optics/script_component.hpp
@@ -1,9 +1,9 @@
-#define COMPONENT optics
+#define COMPONENT optics
 #include "\x\cba\addons\main\script_mod.hpp"
 
-//#define DEBUG_MODE_FULL
-//#define DISABLE_COMPILE_CACHE
-//#define DEBUG_ENABLED_OPTICS
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define DEBUG_ENABLED_OPTICS
 
 #ifdef DEBUG_ENABLED_OPTICS
     #define DEBUG_MODE_FULL