Merge branch 'master' of github.com:ZoneMinder/zoneminder

Author: connortechnology

web/skins/classic/views/js/watch.js

@@ -1439,19 +1439,27 @@ function monitorsSetScale(id=null) {
 // Kick everything off
 $j( window ).on("load", initPage);
 
+var prevStateStarted = false;
 document.onvisibilitychange = () => {
   // Always clear it because the return to visibility might happen before timeout
   TimerHideShow = clearTimeout(TimerHideShow);
   if (document.visibilityState === "hidden") {
     TimerHideShow = setTimeout(function() {
       //Stop monitor when closing or hiding page
       if (monitorStream) {
-        monitorStream.kill();
+        if (monitorStream.started) {
+          prevStateStarted = 'played';
+          //Stop only if playing or paused.
+          monitorStream.kill();
+        } else {
+          prevStateStarted = false;
+        }
       }
     }, 15*1000);
   } else {
     //Start monitor when show page
-    if (monitorStream && !monitorStream.started && (idle<ZM_WEB_VIEWING_TIMEOUT)) {
+    if (monitorStream && prevStateStarted == 'played' && (idle<ZM_WEB_VIEWING_TIMEOUT)) {
+      onPlay(); //Set the correct state of the player buttons.
       monitorStream.start();
     }
   }