From 9b76e76b43d123b5ab91edd51ca56db9281e514f Mon Sep 17 00:00:00 2001
From: Dimitri Mizenko <dimitri.mizenko@evehome.com>
Date: Mon, 25 Oct 2021 16:02:49 +0200
Subject: [PATCH] fix identify init

---
 src/app/clusters/identify-server/identify-server.cpp | 8 ++++----
 src/app/clusters/identify-server/identify-server.h   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
index 81e457bff1842b..9a326844e7638b 100644
--- a/src/app/clusters/identify-server/identify-server.cpp
+++ b/src/app/clusters/identify-server/identify-server.cpp
@@ -88,6 +88,7 @@ static inline void reg(Identify * inst)
         if (nullptr == instances[i])
         {
             instances[i] = inst;
+            break;
         }
     }
 }
@@ -105,7 +106,7 @@ static inline void unreg(Identify * inst)
 
 void emberAfIdentifyClusterServerInitCallback(EndpointId endpoint)
 {
-    (void) endpoint;
+    (void) Clusters::Identify::Attributes::IdentifyType::Set(endpoint, inst(endpoint)->mIdentifyType);
 }
 
 static void onIdentifyClusterTick(chip::System::Layer * systemLayer, void * appState)
@@ -315,11 +316,10 @@ Identify::Identify(chip::EndpointId endpoint, onIdentifyStartCb onIdentifyStart,
                    EmberAfIdentifyIdentifyType identifyType, onEffectIdentifierCb onEffectIdentifier,
                    EmberAfIdentifyEffectIdentifier effectIdentifier, EmberAfIdentifyEffectVariant effectVariant) :
     mEndpoint(endpoint),
-    mOnIdentifyStart(onIdentifyStart), mOnIdentifyStop(onIdentifyStop), mOnEffectIdentifier(onEffectIdentifier),
-    mCurrentEffectIdentifier(effectIdentifier), mTargetEffectIdentifier(effectIdentifier),
+    mOnIdentifyStart(onIdentifyStart), mOnIdentifyStop(onIdentifyStop), mIdentifyType(identifyType),
+    mOnEffectIdentifier(onEffectIdentifier), mCurrentEffectIdentifier(effectIdentifier), mTargetEffectIdentifier(effectIdentifier),
     mEffectVariant(static_cast<uint8_t>(effectVariant))
 {
-    (void) Clusters::Identify::Attributes::IdentifyType::Set(endpoint, identifyType);
     reg(this);
 };
 
diff --git a/src/app/clusters/identify-server/identify-server.h b/src/app/clusters/identify-server/identify-server.h
index 8a0d43abec2c20..38f53afedc045a 100644
--- a/src/app/clusters/identify-server/identify-server.h
+++ b/src/app/clusters/identify-server/identify-server.h
@@ -53,6 +53,7 @@ struct Identify
     chip::EndpointId mEndpoint;
     onIdentifyStartCb mOnIdentifyStart = nullptr;
     onIdentifyStopCb mOnIdentifyStop   = nullptr;
+    EmberAfIdentifyIdentifyType mIdentifyType;
     onEffectIdentifierCb mOnEffectIdentifier;
     EmberAfIdentifyEffectIdentifier mCurrentEffectIdentifier;
     EmberAfIdentifyEffectIdentifier mTargetEffectIdentifier;