ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix width and height defaeulting to monitor size when scale==100

pull/3122/head
Isaac Connor 2017-07-07 20:02:02 -04:00
parent 21881235f9
commit 3577a3e0a3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/includes/functions.php
View File

@ -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;
}
$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;
}
$options['height'] = NULL;
} else if ( $options['height'] == 100 ) {
$options['height'] = $monitor->Height();
}
}
if ( ! isset($options['mode'] ) ) {