Merge pull request #86 from larsacus/double-KVO-register

Fixing adding duplicate observers for ad adapter
larsacus · May 22, 2014 · 63c3260 · 63c3260
2 parents ecab96d + b22c855
commit 63c3260
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Source/LARSAdController.m b/Source/LARSAdController.m
@@ -585,8 +585,15 @@ - (BOOL)startAdNetworkAdapterClass:(Class)klass{
                   forKeyPath:kLARSAdObserverKeyPathIsAdVisible
                      options:NSKeyValueObservingOptionNew
                      context:nil];
-        
+
         [self.clippingContainer addSubview:adapter.bannerView];
+
+        if ([adapter respondsToSelector:@selector(adLoaded)]) {
+          [adapter addObserver:self
+                    forKeyPath:kLARSAdObserverKeyPathAdLoaded
+                       options:NSKeyValueObservingOptionNew
+                       context:nil];
+        }
     }
     else if([adapter respondsToSelector:@selector(pauseAdRequests)] &&
             [adapter respondsToSelector:@selector(startAdRequests)]){
@@ -603,11 +610,6 @@ - (BOOL)startAdNetworkAdapterClass:(Class)klass{
     //  is loaded before actually displaying it if the ad adapter
     //  supports it. makes for a much cleaner visual experience
     if ([adapter respondsToSelector:@selector(adLoaded)]) {
-        [adapter addObserver:self
-                  forKeyPath:kLARSAdObserverKeyPathAdLoaded
-                     options:NSKeyValueObservingOptionNew
-                     context:nil];
-
         if (adapter.adLoaded) {
             [self animateBannerForAdapterVisible:adapter
                                   withCompletion:nil];