From 9599dd2f2bfcc0a9997b6d90989fd02209bd73ee Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Mon, 21 Mar 2011 04:13:39 -0700
Subject: Call setDelegate:nil during _H<> = nil.

---
 Menes/ObjectHandle.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Menes')

diff --git a/Menes/ObjectHandle.h b/Menes/ObjectHandle.h
index 188ec1a..c4f4d1a 100644
--- a/Menes/ObjectHandle.h
+++ b/Menes/ObjectHandle.h
@@ -79,10 +79,10 @@ class MenesObjectHandle {
             CFRetain((CFTypeRef) value_);
     }
 
-    _finline void Clear_() {
-        if (value_ != nil) {
-            MenesObjectHandle_<Type_, Delegate_>::Execute(value_);
-            CFRelease((CFTypeRef) value_);
+    _finline void Release_(Type_ *value) {
+        if (value != nil) {
+            MenesObjectHandle_<Type_, Delegate_>::Execute(value);
+            CFRelease((CFTypeRef) value);
         }
     }
 
@@ -100,7 +100,7 @@ class MenesObjectHandle {
     }
 
     _finline ~MenesObjectHandle() {
-        Clear_();
+        Release_(value_);
     }
 
     _finline operator Type_ *() const {
@@ -112,8 +112,7 @@ class MenesObjectHandle {
             Type_ *old(value_);
             value_ = value;
             Retain_();
-            if (old != nil)
-                CFRelease((CFTypeRef) old);
+            Release_(old);
         } return *this;
     }
 
-- 
cgit v1.2.3