Merge pull request #4212 from IgorA100/patch-51674

Fix: Load 'js/hls.js' if at least one of the cameras uses HLS on the Watch page

Author: connortechnology

web/skins/classic/views/watch.php

@@ -103,10 +103,16 @@
 }
 #Whether to show the controls button
 $hasPtzControls = false;
+$hasHLS = false;
 foreach ($monitors as $m) {
   if (( ZM_OPT_CONTROL && $m->Controllable() && canView('Control') && $m->Type() != 'WebSite' )) {
     //If there is control for at least one camera, then we display the block.
     $hasPtzControls = true;
+  }
+  if ( $m->RTSP2WebEnabled() and $m->RTSP2WebType == "HLS") {
+    $hasHLS = true;
+  }
+  if ($hasPtzControls && $hasHLS) {
     break;
   }
 }
@@ -494,7 +500,7 @@ class="table-sm table-borderless"
   </div>
 </div>
 <?php
-if ( $monitor->RTSP2WebEnabled() and $monitor->RTSP2WebType == "HLS") {
+if ($hasHLS) {
 ?>
   <script src="<?php echo cache_bust('js/hls.js') ?>"></script>
 <?php