Merge pull request #1519 from jpwhite4/chrome_fail

Change chromium output error detection.
ubccr · Mar 30, 2021 · bf6c030 · bf6c030
2 parents 50d31d7 + bd365e5
commit bf6c030
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/libraries/charting.php b/libraries/charting.php
@@ -130,10 +130,12 @@ function getSvgFromChromium($html, $width, $height){
 
     @unlink($tmpHtmlFile);
 
-    if ($return_value != 0) {
-        throw new \Exception('Unable execute command: "'. $command . '". Details: ' . $err);
-    }
     $result = json_decode(substr($out, 4, -6), true);
+
+    if ($result === null || !isset($result['result']) || !isset($result['result']['value'])) {
+        throw new \Exception('Error executing command: "'. $command . '". Details: ' . $return_value . " " . $out . ' Errors: ' . $err);
+    }
+
     return $result['result']['value'];
 }