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

Disconnect if we call loadMonitor a second time.

This commit is contained in:
Isaac Connor 2021-04-12 13:35:45 -04:00
parent 7adeb87041
commit cfe51d7349
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_stream.cpp
View File

@ -50,6 +50,10 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
return false;
}
if ( monitor->isConnected() ) {
monitor->disconnect();
}
if ( !monitor->connect() ) {
Error("Unable to connect to monitor id %d for streaming", monitor_id);
monitor->disconnect();
@ -60,15 +64,15 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
}
bool StreamBase::checkInitialised() {
if ( !monitor ) {
if (!monitor) {
Error("Cannot stream, not initialised");
return false;
}
if ( monitor->GetFunction() == Monitor::NONE ) {
if (monitor->GetFunction() == Monitor::NONE) {
Info("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
return false;
}
if ( !monitor->ShmValid() ) {
if (!monitor->ShmValid()) {
Error("Monitor shm is not connected");
return false;
}