fixed frozen cameras after exiting full screen

diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample
index ec3189d247d85dd9ab348762316b44292d5a00ed..552f6998d97479dc25b82feff9c3fd53a7e641e5 100644 (file)
--- 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 957a3260645a07c54f74a58490b3901201cb2a2f..9848f131824af053ec9ac9632e962c3f083b1240 100644 (file)
--- 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', '');