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

fix logic that would leak mem by called loadMonitor repeatedly

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

22
src/zm_monitorstream.cpp
View File

@ -480,18 +480,20 @@ void MonitorStream::runStream() {
if (type == STREAM_JPEG)
fputs("Content-Type: multipart/x-mixed-replace; boundary=" BOUNDARY "\r\n\r\n", stdout);
while (!(loadMonitor(monitor_id) || zm_terminate)) {
sendTextFrame("Not connected");
/* This is all about waiting and showing a useful message if the monitor isn't available */
while (!zm_terminate) {
if (connkey)
checkCommandQueue();
sleep(1);
}
if (zm_terminate) return;
while (!checkInitialised() and !zm_terminate) {
sendTextFrame("Unable to stream");
if (connkey)
checkCommandQueue();
sleep(1);
if (!loadMonitor(monitor_id)) {
sendTextFrame("Not connected");
sleep(1);
} else if (!checkInitialised()) {
sendTextFrame("Unable to stream");
sleep(1);
} else {
break;
}
}
if (zm_terminate) return;