From 95f9e0b19ad1c6ccd175d8c9d60bf75305563c5b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 12 Jan 2023 09:25:39 -0500 Subject: [PATCH 1/2] Fix crash from getting packet from rend --- src/zm_videostore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp index 5171b5fad..72b58f976 100644 --- a/src/zm_videostore.cpp +++ b/src/zm_videostore.cpp @@ -983,10 +983,10 @@ int VideoStore::writePacket(const std::shared_ptr &zm_pkt) { } // end while if (have_out_of_order) { - AVPacket *p = ((*rit)->packet).get(); if (rit == queue.rend()) { - Warning("Unable to re-order packet, packet dts is %" PRId64, p->dts); + Debug(1, "Unable to re-order packet, packet dts is %" PRId64, av_pkt->dts); } else { + AVPacket *p = ((*rit)->packet).get(); Debug(1, "Found out of order packet, inserting after %" PRId64, p->dts); } queue.insert(rit.base(), zm_pkt); From a8c80fde27ecb4eee03e067630a019a58d32dad0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Jan 2023 17:22:13 -0500 Subject: [PATCH 2/2] Update monitor preset view: Use a submit button instead of input with javascript. Remove no longer needed js code. Sort presets by Name. --- web/skins/classic/views/js/monitorpreset.js | 9 +----- web/skins/classic/views/monitorpreset.php | 34 ++++++++++----------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/web/skins/classic/views/js/monitorpreset.js b/web/skins/classic/views/js/monitorpreset.js index 1b8fa5e58..9c29ed6ac 100644 --- a/web/skins/classic/views/js/monitorpreset.js +++ b/web/skins/classic/views/js/monitorpreset.js @@ -1,12 +1,5 @@ -var form = $j('#monitorPresetForm'); - -function submitPreset( element ) { - form.target = opener.name; - form.view.value = 'monitor'; - form.submit(); -} - function configureButtons() { + const form = document.getElementById('monitorPresetForm'); form.saveBtn.disabled = (form.preset.selectedIndex==0); } diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php index 645872943..ac4491432 100644 --- a/web/skins/classic/views/monitorpreset.php +++ b/web/skins/classic/views/monitorpreset.php @@ -18,18 +18,11 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // -if ( !canEdit( 'Monitors' ) ) -{ - $view = "error"; - return; -} -$sql = "select Id,Name from MonitorPresets"; -$presets = array(); -$presets[0] = translate('ChoosePreset'); -foreach( dbFetchAll( $sql ) as $preset ) -{ - $presets[$preset['Id']] = htmlentities( $preset['Name'] ); +if (!canEdit('Monitors')) { + $view = 'error'; + return; } +$mid = isset($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0; $focusWindow = true; @@ -38,20 +31,27 @@ xhtmlHeaders(__FILE__, translate('MonitorPreset') );
-

+

- - + +

- + +

- - + +