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

fix SteadyClock vs Systemclock issues

This commit is contained in:
Isaac Connor 2021-12-31 18:36:23 -05:00
parent 6bd04de5f6
commit a66adb6dcd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_monitor.h
View File

@ -534,6 +534,9 @@ public:
return shared_data->last_viewed_time; return shared_data->last_viewed_time;
return 0; return 0;
} }
void setLastViewed() {
setLastViewed(std::chrono::system_clock::now());
}
void setLastViewed(SystemTimePoint new_time) { void setLastViewed(SystemTimePoint new_time) {
if (shared_data && shared_data->valid) if (shared_data && shared_data->valid)
shared_data->last_viewed_time = shared_data->last_viewed_time =

2
src/zm_monitorstream.cpp
View File

@ -582,7 +582,7 @@ void MonitorStream::runStream() {
} }
now = std::chrono::steady_clock::now(); now = std::chrono::steady_clock::now();
monitor->setLastViewed(now); monitor->setLastViewed();
bool was_paused = paused; bool was_paused = paused;
bool got_command = false; // commands like zoom should output a frame even if paused bool got_command = false; // commands like zoom should output a frame even if paused