@@ -294,6 +294,7 @@ public bool IsSearching
294
294
SelectedSearchedCommit = null ;
295
295
SearchCommitFilter = string . Empty ;
296
296
MatchedFilesForSearching = null ;
297
+ _requestingWorktreeFiles = false ;
297
298
_worktreeFiles = null ;
298
299
}
299
300
}
@@ -568,6 +569,7 @@ public void Close()
568
569
_searchedCommits . Clear ( ) ;
569
570
_selectedSearchedCommit = null ;
570
571
572
+ _requestingWorktreeFiles = false ;
571
573
_worktreeFiles = null ;
572
574
_matchedFilesForSearching = null ;
573
575
}
@@ -2698,19 +2700,27 @@ private void CalcWorktreeFilesForSearching()
2698
2700
{
2699
2701
if ( ! IsSearchingCommitsByFilePath ( ) )
2700
2702
{
2703
+ _requestingWorktreeFiles = false ;
2701
2704
_worktreeFiles = null ;
2702
2705
MatchedFilesForSearching = null ;
2703
2706
GC . Collect ( ) ;
2704
2707
return ;
2705
2708
}
2706
2709
2710
+ if ( _requestingWorktreeFiles )
2711
+ return ;
2712
+
2713
+ _requestingWorktreeFiles = true ;
2714
+
2707
2715
Task . Run ( ( ) =>
2708
2716
{
2709
2717
_worktreeFiles = new Commands . QueryRevisionFileNames ( _fullpath , "HEAD" ) . Result ( ) ;
2710
2718
Dispatcher . UIThread . Invoke ( ( ) =>
2711
2719
{
2712
- if ( IsSearchingCommitsByFilePath ( ) )
2720
+ if ( IsSearchingCommitsByFilePath ( ) && _requestingWorktreeFiles )
2713
2721
CalcMatchedFilesForSearching ( ) ;
2722
+
2723
+ _requestingWorktreeFiles = false ;
2714
2724
} ) ;
2715
2725
} ) ;
2716
2726
}
@@ -2796,6 +2806,7 @@ private void AutoFetchImpl(object sender)
2796
2806
private string _searchCommitFilter = string . Empty ;
2797
2807
private List < Models . Commit > _searchedCommits = new List < Models . Commit > ( ) ;
2798
2808
private Models . Commit _selectedSearchedCommit = null ;
2809
+ private bool _requestingWorktreeFiles = false ;
2799
2810
private List < string > _worktreeFiles = null ;
2800
2811
private List < string > _matchedFilesForSearching = null ;
2801
2812
0 commit comments