Merge branch 'ZoneMinder:master' into patch-64

.cirrus.yml

@@ -2,8 +2,8 @@ task:
   name: freebsd-build
   freebsd_instance:
     matrix:
-      - image_family: freebsd-12-3
-      - image_family: freebsd-13-0
+      - image_family: freebsd-14-0
+      - image_family: freebsd-13-2
 
   prepare_script:
     - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat

src/zm_signal.cpp

@@ -85,6 +85,7 @@ RETSIGTYPE zm_die_handler(int signal)
     }
   }
 #endif				// ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+#endif                          // (defined(__i386__) || defined(__x86_64__)
 
 
   // Print backtrace if enabled and available
@@ -128,7 +129,6 @@ RETSIGTYPE zm_die_handler(int signal)
     Error("%s", cmd);
   }
 #endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
-#endif                          // (defined(__i386__) || defined(__x86_64__)
   // Icon: Don't exit, setting zm_terminate should cause the exit to happen in a timely manner.
   // The main reason not to here is to make valgrind traces quieter because logger gets free while other threads
   // are still running and trying to log.

web/skins/classic/includes/functions.php

@@ -651,7 +651,7 @@ function getConsoleHTML() {
   global $user;
   $result = '';
   
-  if (count($user->viewableMonitorIds())) {
+  if (count($user->viewableMonitorIds()) or !ZM\Monitor::find_one()) {
     $result .= '<li id="getConsoleHTML" class="nav-item"><a class="nav-link" href="?view=console">'.translate('Console').'</a></li>'.PHP_EOL;
   }
   

web/skins/classic/views/js/events.js

@@ -180,6 +180,7 @@ function onDownloadClick(evt) {
 // Manage the DELETE CONFIRMATION modal button
 function manageDelConfirmModalBtns() {
   document.getElementById('delConfirmBtn').addEventListener('click', function onDelConfirmClick(evt) {
+    document.getElementById('delConfirmBtn').disabled = true; // prevent double click
     if (!canEdit.Events) {
       enoperm();
       return;