Merge pull request #1347 from vector-im/riot_1342

Fix: Crash when hitting room from unified search/browse directory
This commit is contained in:
manuroe
2017-06-22 15:22:14 +02:00
committed by GitHub
+1 -1
View File
@@ -2613,7 +2613,7 @@
[self checkReadMarkerVisibility];
// Switch back to the live mode when the user scrolls to the bottom of the non live timeline.
if (!self.roomDataSource.isLive)
if (!self.roomDataSource.isLive && ![self isRoomPreview])
{
CGFloat contentBottomPosY = self.bubblesTableView.contentOffset.y + self.bubblesTableView.frame.size.height - self.bubblesTableView.contentInset.bottom;
if (contentBottomPosY >= self.bubblesTableView.contentSize.height && ![self.roomDataSource.timeline canPaginate:MXTimelineDirectionForwards])