Update src/darwin/Framework/CHIP/MTRDevice.mm

Co-authored-by: Karsten Sperling <[email protected]>
jtung-apple · Jun 12, 2024 · da84949 · da84949
1 parent 523ec27
commit da84949
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -126,11 +126,10 @@ - (BOOL)callDelegateWithBlock:(void (^)(id<MTRDeviceDelegate>))block
 #ifdef DEBUG
 - (BOOL)callDelegateSynchronouslyWithBlock:(void (^)(id<MTRDeviceDelegate>))block
 {
-    if (self.delegateIsNull) {
-        return NO;
-    }
-
-    block(_delegate);
+    id<MTRDeviceDelegate> strongDelegate = _delegate;
+    VerifyOrReturnValue(strongDelegate, NO);
+
+    block(strongDelegate);
 
     return YES;
 }