fix Camera bug #37

jezzmemo · Dec 4, 2018 · cc2e6ab · cc2e6ab
1 parent 9ab76e2
commit cc2e6ab
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/JJException/Source/MRC/NSObject+KVOCrash.m b/JJException/Source/MRC/NSObject+KVOCrash.m
@@ -155,12 +155,12 @@ - (NSMutableSet*)kvoObjectSet{
 
 @interface JJObserverContainer : NSObject
 
-@property (nonatomic,readwrite,strong) NSHashTable* observers;
+@property (nonatomic,readwrite,retain) NSHashTable* observers;
 
 /**
  Associated owner object
  */
-@property(nonatomic,readwrite,unsafe_unretained)NSObject* whichObject;
+@property(nonatomic,readwrite,assign) NSObject* whichObject;
 
 - (void)addObserver:(KVOObjectItem *)observer;
 
@@ -314,11 +314,13 @@ - (void)hookRemoveObserver:(NSObject *)observer forKeyPath:(NSString *)keyPath{
 - (void)jj_cleanKVO{
 
     KVOObjectContainer* objectContainer = objc_getAssociatedObject(self, &DeallocKVOKey);
-    [objectContainer cleanKVOData];
-
     JJObserverContainer* observerContainer = objc_getAssociatedObject(self, &ObserverDeallocKVOKey);
-    [observerContainer cleanObservers];
 
+    if (objectContainer) {
+        [objectContainer cleanKVOData];
+    }else if(observerContainer){
+        [observerContainer cleanObservers];
+    }
 }
 
 @end