From f0b06553367a0d898f79c9f3cb2c8d1350b2c89f Mon Sep 17 00:00:00 2001
From: ntruchsess <>
Date: Fri, 8 Nov 2013 00:23:05 +0000
Subject: [PATCH] FRM_RGB: remove a die from Color.pm

git-svn-id: https://svn.fhem.de/fhem/trunk@4175 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/20_FRM_RGB.pm | 1 +
 fhem/FHEM/Color.pm      | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fhem/FHEM/20_FRM_RGB.pm b/fhem/FHEM/20_FRM_RGB.pm
index 6526a9da0..b100b9982 100644
--- a/fhem/FHEM/20_FRM_RGB.pm
+++ b/fhem/FHEM/20_FRM_RGB.pm
@@ -154,6 +154,7 @@ FRM_RGB_Set($@)
       my $arg = $a[0];
       my $numPins = scalar(@{$hash->{PINS}});
       my $nybles = $numPins << 1;
+      die "$arg is not the right format" unless( $arg =~ /^[\da-f]{$nybles}$/i );
       my @channels = RgbToChannels($arg,$numPins);
       FRM_RGB_SetChannels($hash,@channels);
       RGBHANDLER: {
diff --git a/fhem/FHEM/Color.pm b/fhem/FHEM/Color.pm
index 98e645e04..86e51da18 100644
--- a/fhem/FHEM/Color.pm
+++ b/fhem/FHEM/Color.pm
@@ -63,8 +63,6 @@ Exporter::export_tags('all');
 sub
 RgbToChannels($$) {
   my ($rgb,$numChannels) = @_;
-  my $nybles = $numChannels << 1;
-  die "$rgb is not the right format" unless( $rgb =~ /^[\da-f]{$nybles}$/i );
   my @channels = ();
   foreach my $channel (unpack("(A2)[$numChannels]",$rgb)) {
     push @channels,hex($channel);