ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup logic and fix the zone names coming before the Motion: label

This commit is contained in:
Isaac Connor 2021-12-28 12:33:23 -05:00
parent f9f8764507
commit 0e148d809a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -1894,16 +1894,14 @@ bool Monitor::Analyse() {
alarm_cause += std::string(zone.Label()); alarm_cause += std::string(zone.Label());
} }
} }
if (!alarm_cause.empty())
cause = cause+" "+alarm_cause;
Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)", Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
score, last_motion_score, motion_score); score, last_motion_score, motion_score);
motion_frame_count += 1; motion_frame_count += 1;
last_motion_score = motion_score; last_motion_score = motion_score;
if (motion_score) { if (motion_score) {
if (cause.length()) cause += ", "; if (cause.length()) cause += ", ";
cause += MOTION_CAUSE; cause += MOTION_CAUSE+":"+alarm_cause;
noteSetMap[MOTION_CAUSE] = zoneSet; noteSetMap[MOTION_CAUSE] = zoneSet;
} // end if motion_score } // end if motion_score
} }