From fed4dae7e580287871dfd7c02bd54f3875bc29d5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 11 Jul 2017 19:13:29 -0400
Subject: [PATCH] fix width and height in options

---
 web/includes/functions.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index b50a14917..fc2f6364d 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2133,18 +2133,14 @@ function getStreamHTML( $monitor, $options = array() ) {
     $options['height'] = reScale( $monitor->Height(), $options['scale'] );
   } else {
     if ( ! isset( $options['width'] ) ) {
-      if ( $options['width'] == 100 ) {
-        $options['width'] = $monitor->Width();
-      } else {
         $options['width'] = NULL;
-      }
+    } else if ( $options['width'] == 100 ) {
+      $options['width'] = $monitor->Width();
     }
     if ( ! isset( $options['height'] ) ) {
-      if ( $options['height'] == 100 ) {
-        $options['height'] = $monitor->Height();
-      } else {
         $options['height'] = NULL;
-      }
+    } else if ( $options['height'] == 100 ) {
+      $options['height'] = $monitor->Height();
     }
   }
   if ( ! isset($options['mode'] ) ) {