Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PTRun]Integrated lock mechanism for thread-safe Results updates. (#26104)

Browse Source
This commit is contained in:
gokcekantarci
2023-06-06 15:11:09 +03:00
committed by GitHub
parent 0f6ac52f99
commit ddaa348e5a
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs
View File

@@ -41,7 +41,7 @@ namespace PowerLauncher.ViewModel
private readonly PowerToysRunSettings _settings;
private readonly QueryHistory _history;
private readonly UserSelectedRecord _userSelectedRecord;
private readonly object _addResultsLock = new object();
private static readonly object _addResultsLock = new object();
private readonly System.Diagnostics.Stopwatch _hotkeyTimer = new System.Diagnostics.Stopwatch();
private string _queryTextBeforeLeaveResults;
@@ -736,27 +736,30 @@ namespace PowerLauncher.ViewModel
{
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
// Using CurrentCultureIgnoreCase since this is user facing
if (queryText.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
lock (_addResultsLock)
{
Results.Results.NotifyChanges();
}
if (Results.Results.Count > 0)
{
Results.Visibility = Visibility.Visible;
if (!isDelayedInvoke || noInitialResults)
// Using CurrentCultureIgnoreCase since this is user facing
if (queryText.Equals(_currentQuery, StringComparison.CurrentCultureIgnoreCase))
{
Results.SelectedIndex = 0;
if (noInitialResults)
Results.Results.NotifyChanges();
}
if (Results.Results.Count > 0)
{
Results.Visibility = Visibility.Visible;
if (!isDelayedInvoke || noInitialResults)
{
Results.SelectedItem = Results.Results.FirstOrDefault();
Results.SelectedIndex = 0;
if (noInitialResults)
{
Results.SelectedItem = Results.Results.FirstOrDefault();
}
}
}
}
else
{
Results.Visibility = Visibility.Hidden;
else
{
Results.Visibility = Visibility.Hidden;
}
}
}));
}
@@ -1217,5 +1220,13 @@ namespace PowerLauncher.ViewModel
{
return _settings.SearchWaitForSlowResults;
}
public static void PerformSafeAction(Action action)
{
lock (_addResultsLock)
{
action.Invoke();
}
}
}
}