devStateIcon bugfix (space)
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2583 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -2369,7 +2369,6 @@ FW_dev2image($)
|
|||||||
my $model = $attr{$name}{model} if(defined($attr{$name}{model}));
|
my $model = $attr{$name}{model} if(defined($attr{$name}{model}));
|
||||||
|
|
||||||
my (undef, $rstate) = ReplaceEventMap($name, [undef, $state], 0);
|
my (undef, $rstate) = ReplaceEventMap($name, [undef, $state], 0);
|
||||||
$state =~ s/ .*//; # Want to be able to have icons for "on-for-timer xxx"
|
|
||||||
|
|
||||||
my $icon;
|
my $icon;
|
||||||
my $devStateIcon = AttrVal($name, "devStateIcon", undef);
|
my $devStateIcon = AttrVal($name, "devStateIcon", undef);
|
||||||
@@ -2383,6 +2382,8 @@ FW_dev2image($)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$state =~ s/ .*//; # Want to be able to have icons for "on-for-timer xxx"
|
||||||
|
|
||||||
$icon = FW_getIcon("$name.$state") if(!$icon); # lamp.Aus.png
|
$icon = FW_getIcon("$name.$state") if(!$icon); # lamp.Aus.png
|
||||||
$icon = FW_getIcon("$name.$rstate") if(!$icon); # lamp.on.png
|
$icon = FW_getIcon("$name.$rstate") if(!$icon); # lamp.on.png
|
||||||
$icon = FW_getIcon($name) if(!$icon); # lamp.png
|
$icon = FW_getIcon($name) if(!$icon); # lamp.png
|
||||||
|
|||||||
Reference in New Issue
Block a user