From 4f56a96ff5f71be54254871c0e0baf01dc178d8c Mon Sep 17 00:00:00 2001
From: mrsidey <mrsidey@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 20 Nov 2015 23:42:19 +0000
Subject: [PATCH] 10_ZWave.pm : Corrected merge error in 9948

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9949 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_ZWave.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 39a842ca0..6cbe1c24a 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -2784,7 +2784,7 @@ ZWave_Parse($$@)
     my @vals = ("learnReady", "nodeFound", "slave",
                 "controller", "protocolDone", "done", "failed");
     $evt = ($id eq "00" || hex($id)>@vals+1) ? "unknownArg" : $vals[hex($id)-1];
-    if($evt eq "slave" &&
+    if(($evt eq "slave" || $evt eq "controller") &&
        $arg =~ m/(..)....(..)..(.*)$/) {
       my ($id,$type6,$classes) = ($1, $2, $3);
       return ZWave_SetClasses($homeId, $id, $type6, $classes)