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

Fixed bug in linked monitor loading code which should fix the crash of a monitor linked to a disabled monitor.

Browse Source
This commit is contained in:
Kfir Itzhak
2011-06-30 21:05:55 +03:00
parent 442b9e5ba2
commit 46aa1bb1d8
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

@@ -1732,9 +1732,9 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
if ( n_link_ids > 0 )
{
Debug( 1, "Linking to %d monitors", n_link_ids );
n_linked_monitors = n_link_ids;
linked_monitors = new MonitorLink *[n_linked_monitors];
for ( int i = 0; i < n_linked_monitors; i++ )
linked_monitors = new MonitorLink *[n_link_ids];
int count = 0;
for ( int i = 0; i < n_link_ids; i++ )
{
Debug( 1, "Checking linked monitor %d", link_ids[i] );
@@ -1757,14 +1757,15 @@ void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
{
MYSQL_ROW dbrow = mysql_fetch_row( result );
Debug( 1, "Linking to monitor %d", link_ids[i] );
linked_monitors[i] = new MonitorLink( link_ids[i], dbrow[1] );
linked_monitors[count++] = new MonitorLink( link_ids[i], dbrow[1] );
}
else
{
Debug( 1, "Can't link to monitor %d, invalid id, function or not enabled", link_ids[i] );
Warning( "Can't link to monitor %d, invalid id, function or not enabled", link_ids[i] );
}
mysql_free_result( result );
}
n_linked_monitors = count;
}
}
}