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

1) Reloaded zm_event.cpp to hopefully fix its issues once and for all. 

2) Added backup code in case sendfile() fails.
3) Fixed a bug that allowed to link a monitor to itself, which can cause alarm lasting forever once triggered.
This commit is contained in:
Kfir Itzhak 2011-06-30 18:14:45 +03:00
parent bc255d1b06
commit 442b9e5ba2
2 changed files with 1455 additions and 1450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2903
src/zm_event.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/zm_monitor.cpp
View File

@ -1707,7 +1707,7 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
{ {
*dest_ptr = '\0'; *dest_ptr = '\0';
int link_id = atoi(link_id_str); int link_id = atoi(link_id_str);
if ( link_id > 0 ) if ( link_id > 0 && link_id != id)
{ {
Debug( 3, "Found linked monitor id %d", link_id ); Debug( 3, "Found linked monitor id %d", link_id );
int j; int j;