fix #108

longitachi · Oct 13, 2017 · 5953d71 · 5953d71
1 parent b95af34
commit 5953d71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/PhotoBrowser/ZLPhotoActionSheet.m b/PhotoBrowser/ZLPhotoActionSheet.m
@@ -465,7 +465,7 @@ - (void)requestSelPhotos:(UIViewController *)vc
 
             strongify(weakSelf);
             if (image) {
-                [photos replaceObjectAtIndex:i withObject:[self scaleImage:image]];
+                [photos replaceObjectAtIndex:i withObject:[strongSelf scaleImage:image]];
                 [assets replaceObjectAtIndex:i withObject:model.asset];
             }
 

diff --git a/PhotoBrowser/ZLThumbnailViewController.m b/PhotoBrowser/ZLThumbnailViewController.m
@@ -78,6 +78,7 @@ - (void)dealloc
                     ZLImageNavigationController *weakNav = (ZLImageNavigationController *)strongSelf.navigationController;
 
                     strongSelf.albumListModel = album;
+                    strongSelf.title = album.title;
                     [ZLPhotoManager markSelcectModelInArr:strongSelf.albumListModel.models selArr:weakNav.arrSelectedModels];
                     strongSelf.arrDataSources = [NSMutableArray arrayWithArray:strongSelf.albumListModel.models];
                     [hud hide];
@@ -188,7 +189,7 @@ - (void)viewDidLayoutSubviews
     doneWidth = MAX(70, doneWidth);
     self.btnDone.frame = CGRectMake(width-doneWidth-12, 7, doneWidth, bottomBtnH);
 
-    if (!_isLayoutOK) {
+    if (!_isLayoutOK && self.albumListModel) {
         [self scrollToBottom];
     } else if (_switchOrientation) {
         _switchOrientation = NO;

diff --git a/ZLPhotoBrowser.podspec b/ZLPhotoBrowser.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'ZLPhotoBrowser'
-  s.version      = '2.4.6'
+  s.version      = '2.4.7'
   s.summary      = 'A simple way to multiselect photos from ablum, force touch to preview photo, support portrait and landscape, edit photo, multiple languages(Chinese,English,Japanese)'
   s.homepage     = 'https://github.com/longitachi/ZLPhotoBrowser'
   s.license      = 'MIT'