Merge branch 'develop'

Backelite · Sep 29, 2014 · 3a5d968 · 3a5d968
2 parents 89dba9e + 7f35fb7
commit 3a5d968
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/MaryPopin.podspec b/MaryPopin.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaryPopin"
-  s.version      = "1.4.1"
+  s.version      = "1.4.2"
   s.summary      = "Category to display modal-like view controllers with more options"
 
   s.description  = <<-DESC
@@ -11,13 +11,14 @@ Pod::Spec.new do |s|
 
   s.homepage     = "https://github.com/Backelite/MaryPopin"
   s.social_media_url = 'https://twitter.com/AgenceBackelite'
+  s.screenshot   = "https://raw.githubusercontent.com/Backelite/MaryPopin/master/MaryPopin.gif"
   s.license      = 'MIT'
 
   s.author       = "Backelite"
 
   s.platform     = :ios, '5.0'
 
-  s.source       = { :git => "https://github.com/Backelite/MaryPopin.git", :tag => "1.4.1" }
+  s.source       = { :git => "https://github.com/Backelite/MaryPopin.git", :tag => "1.4.2" }
 
   s.source_files  = 'MaryPopin/**/*.{h,m}'
 

diff --git a/MaryPopin/UIViewController+MaryPopin.m b/MaryPopin/UIViewController+MaryPopin.m
@@ -395,10 +395,9 @@ - (void)removePopinFromHierarchy:(UIViewController *)presentedPopin
     if (NO == [self.presentedPopinViewController popinTransitionUsesDynamics] || self.animator == nil) {
         [presentedPopin willMoveToParentViewController:nil];
         [presentedPopin.view removeFromSuperview];
-
         [presentedPopin removeFromParentViewController];
         [self setPresentedPopinViewController:nil];
-        [self setPresentingPopinViewController:nil];
+        [presentedPopin setPresentingPopinViewController:nil];
     }
 }
 

diff --git a/README.md b/README.md
@@ -32,6 +32,9 @@ that is why we name it a popin controller. And as it is implemented as a categor
 
 ## Changes
 
+v1.4.2
+* Fixed an issue when dismissing chained popins
+
 v1.4.1
 * Warning and minor bug fixing (thanks to @Mazyod)