From efe1960a53fb29903d97002efefe8096b0f69d32 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 8 Feb 2006 12:24:52 +0000
Subject: [PATCH] Bug 279, 280 - Closes window on set preset, saved run states
 fixed and fixed zones issue.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1874 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_actions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/zm_actions.php b/web/zm_actions.php
index 4a6be7cfa..aaf7fb6ad 100644
--- a/web/zm_actions.php
+++ b/web/zm_actions.php
@@ -906,6 +906,7 @@ if ( !empty($action) )
 				elseif ( $control == "preset_set" )
 				{
 					$ctrl_command .= " --preset ".$preset;
+					$view = 'none';
 				}
 				elseif ( $control == "move_map" )
 				{
@@ -979,7 +980,6 @@ if ( !empty($action) )
 				}
 				else
 				{
-
 					$sql = "insert into Controls set ".implode( ", ", $changes );
 					$result = mysql_query( $sql );
 					if ( !$result )
@@ -1032,7 +1032,7 @@ if ( !empty($action) )
 				$refresh_parent = true;
 			}
 		}
-		elseif ( $action == "zone" && !empty( $zid ) )
+		elseif ( $action == "zone" && isset( $zid ) )
 		{
 			$result = mysql_query( "select * from Monitors where Id = '$mid'" );
 			if ( !$result )
@@ -1608,7 +1608,7 @@ if ( !empty($action) )
 		{
 			if ( $run_state || $new_state )
 			{
-				$sql = "select Id,Function from Monitors order by Id";
+				$sql = "select Id,Function,Enabled from Monitors order by Id";
 				$result = mysql_query( $sql );
 				if ( !$result )
 					die( mysql_error() );