From 8ca154d94e5a03a51015f1b92fd35d8403c42f13 Mon Sep 17 00:00:00 2001 From: justme1968 Date: Sat, 14 Jun 2014 20:11:29 +0000 Subject: [PATCH] trigger state only once if followDevices is not set git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6115 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/31_LightScene.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/31_LightScene.pm b/fhem/FHEM/31_LightScene.pm index 7397d6d0d..7b3d675f3 100644 --- a/fhem/FHEM/31_LightScene.pm +++ b/fhem/FHEM/31_LightScene.pm @@ -585,6 +585,7 @@ LightScene_Set($@) @devices = @{$hash->{devices}}; } + my $first = 1; foreach my $d (@devices) { next if(!$defs{$d}); if($defs{$d}{INSET}) { @@ -608,7 +609,8 @@ LightScene_Set($@) $ret .= $d .": ". $state ."\n" if( defined($FW_webArgs{room}) && $FW_webArgs{room} eq "all" ); #only if telnet } elsif ( $cmd eq "scene" ) { - readingsSingleUpdate($hash, "state", $scene, 1 ) if( !$hash->{followDevices} ); + readingsSingleUpdate($hash, "state", $scene, 1 ) if( $first && !$hash->{followDevices} ); + next if( !defined($hash->{SCENES}{$scene}{$d})); my $state = $hash->{SCENES}{$scene}{$d}; @@ -629,6 +631,8 @@ LightScene_Set($@) } else { $ret = "Unknown argument $cmd, choose one of save scene"; } + + $first = 0; } delete($hash->{INSET});