From 757a3bee3786d6877d0fbee7d865064fe211bf7e Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 12 Nov 2014 20:07:01 +0300
Subject: [PATCH] Fixed photo overview preload

---
 app/js/controllers.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 8471c4d9..bbdf69b1 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -1580,12 +1580,22 @@ angular.module('myApp.controllers', ['myApp.i18n'])
 
       var promise = index >= list.length ? loadMore() : $q.when();
       promise.then(function () {
-        if (curJump != jump) {
+        if (curJump != jump || !hasMore) {
           return;
         }
 
-        $scope.messageID = list[index];
-        $scope.photoID = AppMessagesManager.getMessage($scope.messageID).media.photo.id;
+        var messageID = list[index];
+        var message = AppMessagesManager.getMessage(messageID);
+        if (!message ||
+            !message.media ||
+            !message.media.photo ||
+            !message.media.photo.id) {
+          console.error('Invalid photo message', index, list, messageID, message);
+          return;
+        }
+
+        $scope.messageID = messageID;
+        $scope.photoID = message.media.photo.id;
         $scope.photo = AppPhotosManager.wrapForFull($scope.photoID);
 
         updatePrevNext();
@@ -1653,6 +1663,8 @@ angular.module('myApp.controllers', ['myApp.i18n'])
       }
     });
 
+    loadMore();
+
   })
 
   .controller('UserpicModalController', function ($q, $scope, $rootScope, $modalInstance, AppPhotosManager, AppUsersManager, AppPeersManager, AppMessagesManager, PeersSelectService, ErrorService) {