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

Clear timers around changing img.src. Define statusCmdTime at the top.

pull/3477/head
Isaac Connor 2022-04-27 17:45:55 -04:00
parent f21df362fa
commit bdea3473a0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/skins/classic/views/js/watch.js
View File

@ -1,4 +1,5 @@
var streamCmdTimer = null;
var statusCmdTimer = null;
var streamStatus;
var alarmState = STATE_IDLE;
var lastAlarmState = STATE_IDLE;
@ -135,9 +136,7 @@ function setScale() {
function getStreamCmdResponse(respObj, respText) {
watchdogOk('stream');
if (streamCmdTimer) {
streamCmdTimer = clearTimeout(streamCmdTimer);
}
streamCmdTimer = clearTimeout(streamCmdTimer);
if (respObj.result == 'Ok') {
// The get status command can get backed up, in which case we won't be able to get the semaphore and will exit.
if (respObj.status) {
@ -415,9 +414,7 @@ function streamCmdPan(x, y) {
/* getStatusCmd is used when not streaming, since there is no persistent zms */
function getStatusCmdResponse(respObj, respText) {
watchdogOk('status');
if (statusCmdTimer) {
statusCmdTimer = clearTimeout(statusCmdTimer);
}
statusCmdTimer = clearTimeout(statusCmdTimer);
if (respObj.result == 'Ok') {
$j('#captureFPSValue').text(respObj.monitor.FrameRate);