ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-15 07:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1142 from levi/scrollDirectionFix

Browse Source 
Add a safety check for targetContentOffset possibly being NULL
This commit is contained in:
appleguy
2016-01-28 15:55:50 -08:00
parent 8db4544e31 0e0a0f3280
commit 68a4b1ea43
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit/ASCollectionView.mm
View File

@@ -637,8 +637,8 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
{
_deceleratingVelocity = CGPointMake(
scrollView.contentOffset.x - targetContentOffset->x,
scrollView.contentOffset.y - targetContentOffset->y
scrollView.contentOffset.x - ((targetContentOffset != NULL) ? targetContentOffset->x : 0),
scrollView.contentOffset.y - ((targetContentOffset != NULL) ? targetContentOffset->y : 0)
);
[self handleBatchFetchScrollingToOffset:*targetContentOffset];

6
AsyncDisplayKit/ASTableView.mm
View File

@@ -630,10 +630,10 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
- (void)scrollViewWillEndDragging:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset
{
_deceleratingVelocity = CGPointMake(
scrollView.contentOffset.x - targetContentOffset->x,
scrollView.contentOffset.y - targetContentOffset->y
scrollView.contentOffset.x - ((targetContentOffset != NULL) ? targetContentOffset->x : 0),
scrollView.contentOffset.y - ((targetContentOffset != NULL) ? targetContentOffset->y : 0)
);
[self handleBatchFetchScrollingToOffset:*targetContentOffset];
if ([_asyncDelegate respondsToSelector:@selector(scrollViewWillEndDragging:withVelocity:targetContentOffset:)]) {