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

put the sendControlCommand(quit) into the right place

This commit is contained in:
Isaac Connor 2015-01-07 16:56:10 -05:00
parent 21ccb9b91a
commit 74929236e3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/includes/actions.php
View File

@ -277,11 +277,6 @@ if ( !empty($action) )
zmaControl( $monitor, "stop" ); zmaControl( $monitor, "stop" );
zmcControl( $monitor, $restart?"restart":"" ); zmcControl( $monitor, $restart?"restart":"" );
zmaControl( $monitor, "start" ); zmaControl( $monitor, "start" );
if ( $monitor['Controllable'] ) {
require_once( 'control_functions.php' );
sendControlCommand( $mid, 'quit' );
}
$ctrlCommand = ZM_PATH_BIN."/zmcontrol.pl --id=$mid --command=quit";
} }
$refreshParent = true; $refreshParent = true;
} }
@ -541,6 +536,10 @@ if ( !empty($action) )
zmcControl( $monitor, "restart" ); zmcControl( $monitor, "restart" );
zmaControl( $monitor, "start" ); zmaControl( $monitor, "start" );
} }
if ( $monitor['Controllable'] ) {
require_once( 'control_functions.php' );
sendControlCommand( $mid, 'quit' );
}
//daemonControl( 'restart', 'zmwatch.pl' ); //daemonControl( 'restart', 'zmwatch.pl' );
$refreshParent = true; $refreshParent = true;
} }