Merge branch 'devel' into 'master'.

aarpon · Jan 31, 2019 · f48863b · f48863b
2 parents 53ddfb0 + 3bedfea
commit f48863b
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/inc/setting/ParameterSetting.php b/inc/setting/ParameterSetting.php
@@ -1231,32 +1231,34 @@ public function checkPostedCapturingParameters(array $postedParameters) {
         }
 
         // CCDCaptorSizeY
-        $valueSet = isset($postedParameters["CCDCaptorSizeY"]) &&
-        $postedParameters["CCDCaptorSizeY"] != '';
+        if ($this->isArrDetConf()) {
+            $valueSet = isset($postedParameters["CCDCaptorSizeY"]) &&
+            $postedParameters["CCDCaptorSizeY"] != '';
 
-        $parameter = $this->parameter("CCDCaptorSizeY");
+            $parameter = $this->parameter("CCDCaptorSizeY");
 
-        if ($valueSet) {
+            if ($valueSet) {
 
-        // Set the Parameter and check the value
-            $parameter->setValue($postedParameters["CCDCaptorSizeY"]);
-            $this->set($parameter);
-            if (!$parameter->check()) {
-                $this->message = $parameter->message();
-                $noErrorsFound = False;
-            }
-        } else {
+            // Set the Parameter and check the value
+                $parameter->setValue($postedParameters["CCDCaptorSizeY"]);
+                $this->set($parameter);
+                if (!$parameter->check()) {
+                    $this->message = $parameter->message();
+                    $noErrorsFound = False;
+                }
+            } else {
 
-            $mustProvide = $parameter->mustProvide();
+                $mustProvide = $parameter->mustProvide();
 
-            // Reset the Parameter
-            $parameter->reset();
-            $this->set($parameter);
+                // Reset the Parameter
+                $parameter->reset();
+                $this->set($parameter);
 
-            // If the Parameter value must be provided, we return an error
-            if ($mustProvide) {
-                $this->message = "Please set the pixel size!";
-                $noErrorsFound = False;
+                // If the Parameter value must be provided, we return an error
+                if ($mustProvide) {
+                    $this->message = "Please set the pixel size!";
+                    $noErrorsFound = False;
+                }
             }
         }