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

spacing

This commit is contained in:
Isaac Connor 2021-08-29 09:15:40 -04:00 committed by Isaac Connor
parent 85ade02cba
commit 199e86e92a
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_monitor.cpp
View File

@ -236,7 +236,7 @@ bool Monitor::MonitorLink::disconnect() {
struct shmid_ds shm_data; struct shmid_ds shm_data;
if (shmctl(shm_id, IPC_STAT, &shm_data) < 0) { if (shmctl(shm_id, IPC_STAT, &shm_data) < 0) {
Debug(3, "Can't shmctl: %s", strerror(errno)); Debug(3, "Can't shmctl: %s", strerror(errno));
return( false ); return false;
} }
shm_id = 0; shm_id = 0;
@ -252,7 +252,6 @@ bool Monitor::MonitorLink::disconnect() {
Debug(3, "Can't shmdt: %s", strerror(errno)); Debug(3, "Can't shmdt: %s", strerror(errno));
return false; return false;
} }
#endif // ZM_MEM_MAPPED #endif // ZM_MEM_MAPPED
mem_size = 0; mem_size = 0;
mem_ptr = nullptr; mem_ptr = nullptr;
@ -899,7 +898,6 @@ std::shared_ptr<Monitor> Monitor::Load(unsigned int p_id, bool load_zones, Purpo
} }
bool Monitor::connect() { bool Monitor::connect() {
if (mem_ptr != nullptr) { if (mem_ptr != nullptr) {
Warning("Already connected. Please call disconnect first."); Warning("Already connected. Please call disconnect first.");
} }