Merge branch 'pr/1360'

8 years ago · fb1f274eba
1 changed files with 1 additions and 1 deletions
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@ -456,7 +456,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
				@@ -456,7 +456,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
    var pendingAttachment = false
    $scope.$on('history_focus', function (e, peerData) {
      if (peerData.peerString == $scope.curDialog.peer &&
-        peerData.messageID == $scope.curDialog.messageID &&
+          (peerData.messageID ? peerData.messageID == $scope.curDialog.messageID : !$scope.curDialog.messageID) &&
        !peerData.startParam) {
        if (peerData.messageID) {
          $scope.$broadcast('ui_history_change_scroll', true)