Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

31_LightScene.pm: fixed error message for set scene on non existing scene

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11642 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-06-10 13:10:25 +00:00
parent 08791811fa
commit 7b099b9d8f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/31_LightScene.pm
View File

@ -598,12 +598,12 @@ LightScene_Set($@)
if( $cmd eq "rename" && !defined( $scene ) ) { return "Usage: set $name rename <scene_alt> <scene_neu>" }; if( $cmd eq "rename" && !defined( $scene ) ) { return "Usage: set $name rename <scene_alt> <scene_neu>" };
if( $cmd eq "remove" ) { if( $cmd eq "remove" ) {
return "no such scene $scene" if( !defined $hash->{SCENES}{$scene} ); return "no such scene: $scene" if( !defined $hash->{SCENES}{$scene} );
delete( $hash->{SCENES}{$scene} ); delete( $hash->{SCENES}{$scene} );
return undef; return undef;
} elsif( $cmd eq "rename" ) { } elsif( $cmd eq "rename" ) {
return "no such scene $scene" if( !defined $hash->{SCENES}{$scene} ); return "no such scene: $scene" if( !defined $hash->{SCENES}{$scene} );
my ($new) = @a; my ($new) = @a;
if( !( $new ) ) { return "Usage: set $name rename <scene_alt> <scene_neu>" }; if( !( $new ) ) { return "Usage: set $name rename <scene_alt> <scene_neu>" };
@ -611,11 +611,14 @@ LightScene_Set($@)
delete( $hash->{SCENES}{$scene} ); delete( $hash->{SCENES}{$scene} );
return undef; return undef;
} elsif( $cmd eq "scene" ) {
return "no such scene: $scene" if( !defined $hash->{SCENES}{$scene} );
} elsif( $cmd eq "set" || $cmd eq "setcmd" ) { } elsif( $cmd eq "set" || $cmd eq "setcmd" ) {
my ($d, @args) = @a; my ($d, @args) = @a;
if( !defined( $scene ) || !defined( $d ) ) { return "Usage: set $name set <scene_name> <device> [<cmd>]" }; if( !defined( $scene ) || !defined( $d ) ) { return "Usage: set $name set <scene_name> <device> [<cmd>]" };
return "no stored scene >$scene<" if( !defined($hash->{SCENES}{$scene} ) ); return "no such scene: $scene" if( !defined $hash->{SCENES}{$scene} );
#return "device >$d< is not a member of scene >$scene<" if( !defined($hash->{CONTENT}{$d} ) ); #return "device >$d< is not a member of scene >$scene<" if( !defined($hash->{CONTENT}{$d} ) );
if( !@args ) { if( !@args ) {