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

Fix scale <0 and send zms a quit command because safari will never close the stream. Fixes no image on safari

pull/3468/head
Isaac Connor 2022-04-19 19:30:27 -04:00
parent 1561ad140a
commit 0501f464c5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/js/MonitorStream.js
View File

@ -119,6 +119,7 @@ function MonitorStream(monitorData) {
if (img.nodeName == 'IMG') {
if (newscale > 100) newscale = 100; // we never request a larger image, as it just wastes bandwidth
if (newscale < 0) newscale = 100;
const oldSrc = img.src;
if (!oldSrc) {
console.log('No src on img?!');
@ -128,10 +129,11 @@ function MonitorStream(monitorData) {
let newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+newscale);
if (newSrc != oldSrc) {
this.streamCmdTimer = clearTimeout(this.streamCmdTimer);
console.log('Clear src', oldSrc);
img.src = '';
// We know that only the first zms will get the command because the
// second can't open the commandQueue until the first exits
// This is necessary because safari will never close the first image
this.streamCommand(CMD_QUIT);
img.src = newSrc;
console.log('Done Cleared src', newSrc);
}
}