From f08fa7d6648c9ea3d2453e01a764b1e9775c0835 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Fri, 4 Nov 2016 23:32:03 +0300
Subject: [PATCH] [vcs-log] apply filters immediately

---
 .../impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java        | 3 +--
 .../com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
index b37585d6936c..8a036e5e859b 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
@@ -255,8 +255,7 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
     return myColorManager;
   }
 
-  public void applyFiltersAndUpdateUi() {
-    VcsLogFilterCollection filters = myMainFrame.getFilterUi().getFilters();
+  public void applyFiltersAndUpdateUi(@NotNull VcsLogFilterCollection filters) {
     myFilterer.onFiltersChange(filters);
   }
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
index 6ec9a058aab5..cc55c0c37029 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
@@ -88,14 +88,14 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi {
     myTextFilterModel = new TextFilterModel(dataPackGetter, myUiProperties);
 
     updateUiOnFilterChange();
-    ApplicationManager.getApplication().invokeLater(myUi::applyFiltersAndUpdateUi);
+    myUi.applyFiltersAndUpdateUi(getFilters());
   }
 
   private void updateUiOnFilterChange() {
     FilterModel[] models = {myBranchFilterModel, myUserFilterModel, myDateFilterModel, myStructureFilterModel, myTextFilterModel};
     for (FilterModel<?> model : models) {
       model.addSetFilterListener(() -> {
-        myUi.applyFiltersAndUpdateUi();
+        myUi.applyFiltersAndUpdateUi(getFilters());
         myBranchFilterModel
           .onStructureFilterChanged(new HashSet<>(myLogData.getRoots()), myStructureFilterModel.getFilter());
       });