Fixed bug related to showing the Button when it was not assigned

manuelescrig · Feb 29, 2016 · b2ce225 · b2ce225
1 parent 0711bcf
commit b2ce225
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MEVFloatingButton.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/MEVFloatingButton.xcscheme
diff --git a/Pod/Classes/UIScrollView+FloatingButton.m b/Pod/Classes/UIScrollView+FloatingButton.m
@@ -351,15 +351,7 @@ - (void)setFloatingButtonView:(MEVFloatingButton *)floatingButton
 
 - (MEVFloatingButton *)floatingButton
 {
-    MEVFloatingButton *floatingButton = objc_getAssociatedObject(self, kFloatingButtonView);
-
-    if (floatingButton == nil) {
-        floatingButton = [[MEVFloatingButton alloc] init];
-
-        [self setFloatingButtonView:floatingButton];
-    }
-
-    return floatingButton;
+   return objc_getAssociatedObject(self, kFloatingButtonView);
 }
 
 
@@ -417,7 +409,7 @@ - (BOOL)mev_canDisplay
 {
     BOOL canDisplay = NO;
 
-    if ([self.floatingButton displayMode] != MEVFloatingButtonDisplayModeNone) {
+    if ([self.floatingButton displayMode] != MEVFloatingButtonDisplayModeNone && [self floatingButton]) {
         canDisplay = YES;
     }