From fa34aa1558fe72f2e461f5ac33ad24d67508e1f1 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 15 Feb 2018 11:57:48 +0300
Subject: [PATCH] Fix Bug 36936.

---
 apps/common/main/lib/controller/Comments.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js
index e4f234470..00fc195a1 100644
--- a/apps/common/main/lib/controller/Comments.js
+++ b/apps/common/main/lib/controller/Comments.js
@@ -571,17 +571,16 @@ define([
         },
 
         onUpdateFilter: function (filter, applyOnly) {
-            if (filter && !this.view.isVisible()) {
-                this.view.needUpdateFilter = filter;
-                this.filter = {
-                    property    :   filter.property,
-                    value       :   filter.value
-                };
-                return;
-            }
-            this.view.needUpdateFilter = false;
-
             if (filter) {
+                if (!this.view.isVisible()) {
+                    this.view.needUpdateFilter = filter;
+                    this.filter = {
+                        property    :   filter.property,
+                        value       :   filter.value
+                    };
+                    return;
+                }
+                this.view.needUpdateFilter = false;
 
                 this.filter = {
                     property    :   filter.property,
@@ -972,7 +971,6 @@ define([
                 this.view.needRender = needRender;
                 return;
             }
-            this.view.needRender = false;
 
             var me = this;
             me.updateCommentsTime = new Date();
@@ -1008,6 +1006,7 @@ define([
                 this.onUpdateFilter(this.filter, true);
 
                 this.view.render();
+                this.view.needRender = false;
             }
 
             this.view.update();