Skip to content

fix: don't skip cross-monitor events in gapless playback when sorting by another field #5312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connortechnology merged 1 commit into from
Oct 20, 2026
+9 −5
Merged

fix: don't skip cross-monitor events in gapless playback when sorting by another field #5312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions web/ajax/status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,11 +557,17 @@ function getNearEvents() {
# e.g. several monitors starting events in the same second, so Prev/Next must compare the full
# (sort value, Id) tuple. Comparing the sort value alone with >= / <= lets the event after a tie
# pick the one before it as its Next, and playback loops between them forever.
#
# That tuple is the whole ordering: do not also constrain E.StartDateTime. When the sort is not
# StartDateTime (e.g. MonitorName, grouping cameras, or Id) a time constraint drops events that
# are correctly next in the chosen order but started earlier or later than the current one -- the
# next monitor's first event, or a concurrently recorded event with a higher Id, was skipped
# (refs #4186).
$after = ($sortOrder == 'ASC') ? '>' : '<';
$before = ($sortOrder == 'ASC') ? '<' : '>';
$reverseOrder = ($sortOrder == 'ASC') ? 'DESC' : 'ASC';

$nearEvent = function($cmp, $idCmp, $startCmp, $order, $idOrder) use ($eventId, $event, $filter, $sortColumn, $sortValue) {
$nearEvent = function($cmp, $idCmp, $order, $idOrder) use ($eventId, $filter, $sortColumn, $sortValue) {
$sql = '
SELECT E.Id AS Id, E.StartDateTime AS StartDateTime
FROM Events AS E
Expand All @@ -579,8 +585,6 @@ function getNearEvents() {
if ($filter->sql()) {
$sql .= ' AND ('.$filter->sql().')';
}
$sql .= ' AND E.StartDateTime '.$startCmp.' ?';
$values[] = $event['StartDateTime'];
$sql .= ' ORDER BY '.$sortColumn.' '.$order;
if ($sortColumn != 'E.Id') {
$sql .= ', E.Id '.$idOrder;
Expand All @@ -594,8 +598,8 @@ function getNearEvents() {
return dbFetchNext($result);
};

$prevEvent = $nearEvent($before, '<', '<=', $reverseOrder, 'DESC');
$nextEvent = $nearEvent($after, '>', '>=', $sortOrder, 'ASC');
$prevEvent = $nearEvent($before, '<', $reverseOrder, 'DESC');
$nextEvent = $nearEvent($after, '>', $sortOrder, 'ASC');

if ( $prevEvent ) {
$NearEvents['PrevEventId'] = $prevEvent['Id'];
Expand Down
Loading