Fix OnPairingComplete is not called if pairing code is wrong

project-chip · Oct 18, 2024 · 9607577 · 9607577
1 parent 2574847
commit 9607577
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1141,11 +1141,10 @@ void DeviceCommissioner::RendezvousCleanup(CHIP_ERROR status)
         // for IP commissioning, we have taken a reference to the
         // operational node to send the completion command.
         ReleaseCommissioneeDevice(mDeviceInPASEEstablishment);
-
-        if (mPairingDelegate != nullptr)
-        {
-            mPairingDelegate->OnPairingComplete(status);
-        }
+    }
+    if (CHIP_NO_ERROR != status && mPairingDelegate != nullptr)
+    {
+        mPairingDelegate->OnPairingComplete(status);
     }
 }