Hit on the master state AND motion detectors (if enabled)

dmx/state.pl

@@ -576,11 +576,15 @@ while (1) {
 		$state = 'OFF';
 	}
 
-	# ALARM if LOCK exists and the master state is not OFF
+	# ALARM if LOCK exists and the master state is not OFF or any motion exists
 	{
 		my $alarm = 0;
-		if (exists($files{'LOCK'}) && $files{'LOCK'}->{'value'} && $state ne 'OFF') {
-			$alarm = 1;
+		if (exists($files{'LOCK'}) && $files{'LOCK'}->{'value'}) {
+			if ($state ne 'OFF' ||
+				(exists($files{'MOTION'}) && $files{'MOTION'}->{'value'}) ||
+				(exists($files{'MOTION_STAIRS'}) && $files{'MOTION_STAIRS'}->{'value'})) {
+					$alarm = 1;
+			}
 		}
 		if (!exists($files{'ALARM'}->{'value'}) || $files{'ALARM'}->{'value'} != $alarm) {
 			$files{'ALARM'}->{'update'} = $now;