mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-04 14:04:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move closeEvent to Close(). If we are closing the camera, we have to close the event as well.

Browse Source
This commit is contained in:
Isaac Connor
2021-02-19 20:42:36 -05:00
parent f440ecb235
commit 86d424baf0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_monitor.cpp
View File

@@ -1071,11 +1071,6 @@ Monitor::~Monitor() {
Close();
if (mem_ptr != nullptr) {
std::lock_guard<std::mutex> lck(event_mutex);
if (event) {
Info("%s: image_count:%d - Closing event %" PRIu64 ", shutting down", name, image_count, event->Id());
closeEvent();
}
if (purpose != QUERY) {
shared_data->state = state = IDLE;
shared_data->last_read_index = image_buffer_count;
@@ -2923,10 +2918,16 @@ int Monitor::PrimeCapture() {
int Monitor::PreCapture() const { return camera->PreCapture(); }
int Monitor::PostCapture() const { return camera->PostCapture(); }
int Monitor::Close() {
std::lock_guard<std::mutex> lck(event_mutex);
if (event) {
Info("%s: image_count:%d - Closing event %" PRIu64 ", shutting down", name, image_count, event->Id());
closeEvent();
}
if (camera) camera->Close();
packetqueue.clear();
return 1;
}
Monitor::Orientation Monitor::getOrientation() const { return orientation; }
// Wait for camera to get an image, and then assign it as the base reference image.