From 74929236e31eed645ebd540fc2fa9744f58fb6f7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 7 Jan 2015 16:56:10 -0500 Subject: [PATCH] put the sendControlCommand(quit) into the right place --- web/includes/actions.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/includes/actions.php b/web/includes/actions.php index 705f9e258..c2d32f344 100644 --- a/web/includes/actions.php +++ b/web/includes/actions.php @@ -277,11 +277,6 @@ if ( !empty($action) ) zmaControl( $monitor, "stop" ); zmcControl( $monitor, $restart?"restart":"" ); 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; } @@ -541,6 +536,10 @@ if ( !empty($action) ) zmcControl( $monitor, "restart" ); zmaControl( $monitor, "start" ); } + if ( $monitor['Controllable'] ) { + require_once( 'control_functions.php' ); + sendControlCommand( $mid, 'quit' ); + } //daemonControl( 'restart', 'zmwatch.pl' ); $refreshParent = true; }