From c42062de735d8e32f9c5388bd4697531610898d8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 17 Dec 2015 14:59:27 +0200 Subject: [PATCH] fixed frozen cameras after exiting full screen --- extra/motioneye.conf.sample | 2 +- motioneye/static/js/main.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample index ec3189d..552f699 100644 --- a/extra/motioneye.conf.sample +++ b/extra/motioneye.conf.sample @@ -77,7 +77,7 @@ enable_reboot false # timeout in seconds to use when talking to the SMTP server smtp_timeout 60 -# timeout in seconds to wait media files list +# timeout in seconds to wait for media files list list_media_timeout 120 # timeout in seconds to wait for zip file creation diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js index 957a326..9848f13 100644 --- a/motioneye/static/js/main.js +++ b/motioneye/static/js/main.js @@ -4027,10 +4027,6 @@ function addCameraFrameUi(cameraConfig) { fpsSpan.html(''); }; cameraImg[0].onload = function () { - if (refreshDisabled[cameraId]) { - return; /* refresh temporarily disabled for updating */ - } - if (this.error) { cameraImg.removeClass('error'); cameraPlaceholder.css('opacity', 0); @@ -4214,7 +4210,7 @@ function doExitFullScreenCamera() { if (fullScreenCameraId == null) { return; /* no current full-screen camera */ } - + getCameraFrames(). removeClass('full-screen-hidden'). css('height', ''); -- 2.39.5