diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index cb0420a13..05353cb7f 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -353,7 +353,7 @@ CREATE TABLE `Monitors` ( `AlarmMaxFPS` decimal(5,2) default NULL, `FPSReportInterval` smallint(5) unsigned NOT NULL default '250', `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6', - `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '3', + `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '6', `Controllable` tinyint(3) unsigned NOT NULL default '0', `ControlId` int(10) unsigned NOT NULL default '0', `ControlDevice` varchar(255) default NULL, diff --git a/db/zm_update-1.26.5.sql b/db/zm_update-1.26.5.sql index 7c70d85b7..bffa09129 100644 --- a/db/zm_update-1.26.5.sql +++ b/db/zm_update-1.26.5.sql @@ -14,10 +14,12 @@ SET @s = (SELECT IF( AND column_name = 'AlarmRefBlendPerc' ) > 0, "SELECT 1", -"ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '3' AFTER `RefBlendPerc`" +"ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '6' AFTER `RefBlendPerc`" )); PREPARE stmt FROM @s; EXECUTE stmt; +UPDATE `Monitors` SET `AlarmRefBlendPerc` = `RefBlendPerc`; + diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index c5a2c91ff..13a92dde6 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -96,7 +96,7 @@ else 'AlarmMaxFPS' => "", 'FPSReportInterval' => 1000, 'RefBlendPerc' => 6, - 'AlarmRefBlendPerc' => 3, + 'AlarmRefBlendPerc' => 6, 'DefaultView' => 'Events', 'DefaultRate' => '100', 'DefaultScale' => '100',