Merge pull request #1897 from acemod/vectorCtrlTextGroupFix

#1871 - Don't do ctrlText(set) on RscControlsGroup
acemod · Jul 25, 2015 · 2f186ff · 2f186ff
2 parents 40ed985 + aa3b9e7
commit 2f186ff
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/addons/vector/functions/fnc_illuminate.sqf b/addons/vector/functions/fnc_illuminate.sqf
@@ -7,35 +7,36 @@ disableSerialization;
 _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
 
 if (_this select 0) then {
-
     {
-        private ["_string", "_index"];
+        if (ctrlIDC _x != 170) then {
+            private ["_string", "_index"];
 
-        _string = ctrlText _x;
-        _index = _string find ".paa";
+            _string = ctrlText _x;
+            _index = _string find ".paa";
 
-        if (_index != -1 && {_string find "_illum.paa" == -1}) then {
-            _string = toArray _string;
-            _string resize _index;
+            if (_index != -1 && {_string find "_illum.paa" == -1}) then {
+                _string = toArray _string;
+                _string resize _index;
 
-            _x ctrlSetText format ["%1_illum.paa", toString _string];
+                _x ctrlSetText format ["%1_illum.paa", toString _string];
+            };
         };
     } forEach allControls _dlgVector;
-
 } else {
-
     {
-        private ["_string", "_index"];
+        if (ctrlIDC _x != 170) then {
+            private ["_string", "_index"];
 
-        _string = ctrlText _x;
-        _index = _string find "_illum.paa";
+            _string = ctrlText _x;
+            _index = _string find "_illum.paa";
 
-        if (_index != -1) then {
-            _string = toArray _string;
-            _string resize _index;
+            if (_index != -1) then {
+                _string = toArray _string;
+                _string resize _index;
+
+                _x ctrlSetText format ["%1.paa", toString _string];
+            };
 
-            _x ctrlSetText format ["%1.paa", toString _string];
         };
     } forEach allControls _dlgVector;
-
 };