mirror/WowUp
1
0
Fork 0
mirror of https://github.com/WowUp/WowUp.git synced 2026-05-19 20:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use proper locks

Browse Source 
Use the correct observable locks,
This commit is contained in:
jliddev
2020-08-16 21:21:25 -05:00
parent e8d54287ad
commit a3519cc56e
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
WowUp.WPF/ViewModels/AddonListItemViewModel.cs
View File

@@ -325,7 +325,7 @@ namespace WowUp.WPF.ViewModels
}
catch (Exception ex)
{
Console.WriteLine(ex);
Log.Error("Failed to update addon", ex);
ShowUpdateButton = true;
}
}
@@ -334,6 +334,7 @@ namespace WowUp.WPF.ViewModels
{
ShowStatusText = false;
ShowInstallButton = false;
ShowUpdateButton = false;
try
{

52
WowUp.WPF/ViewModels/AddonsViewViewModel.cs
View File

@@ -20,7 +20,6 @@ namespace WowUp.WPF.ViewModels
{
private static readonly object ClientNamesLock = new object();
private static readonly object DisplayAddonsLock = new object();
private static readonly object LoadLock = new object();
private readonly IServiceProvider _serviceProvider;
private readonly IWarcraftService _warcraftService;
@@ -137,18 +136,21 @@ namespace WowUp.WPF.ViewModels
private void SetClientNames()
{
ClientNames.Clear();
_clientTypes = _warcraftService.GetWowClientTypes();
_clientNames = _warcraftService.GetWowClientNames();
for (var i = 0; i < _clientNames.Count; i += 1)
lock (ClientNamesLock)
{
var clientName = _clientNames[i];
ClientNames.Add(new ComboBoxItem
ClientNames.Clear();
_clientTypes = _warcraftService.GetWowClientTypes();
_clientNames = _warcraftService.GetWowClientNames();
for (var i = 0; i < _clientNames.Count; i += 1)
{
Content = clientName
});
var clientName = _clientNames[i];
ClientNames.Add(new ComboBoxItem
{
Content = clientName
});
}
}
SelectedWowIndex = 0;
@@ -188,7 +190,7 @@ namespace WowUp.WPF.ViewModels
try
{
await DisplayAddons
await DisplayAddons.ToList()
.Where(addon => addon.IsAutoUpdated && (addon.CanUpdate || addon.CanInstall))
.ForEachAsync(2, async addon =>
{
@@ -279,24 +281,24 @@ namespace WowUp.WPF.ViewModels
private void AddAddonListItem(Addon addon)
{
lock (LoadLock)
try
{
try
if (DisplayAddons.Any(da => da.Addon.Id == addon.Id))
{
if (DisplayAddons.Any(da => da.Addon.Id == addon.Id))
{
return;
}
return;
}
var viewModel = GetAddonViewModel(addon);
var viewModel = GetAddonViewModel(addon);
lock (DisplayAddonsLock)
{
DisplayAddons.Add(viewModel);
SortAddons(DisplayAddons);
}
finally
{
EnableUpdateAll = DisplayAddons.Any(addon => addon.CanUpdate || addon.CanInstall);
}
}
finally
{
EnableUpdateAll = DisplayAddons.Any(addon => addon.CanUpdate || addon.CanInstall);
}
}
@@ -312,7 +314,7 @@ namespace WowUp.WPF.ViewModels
private void RemoveAddonListItem(Addon addon)
{
lock (LoadLock)
lock (DisplayAddonsLock)
{
DisplayAddons.Remove(DisplayAddons.First(da => addon.Id == da.Addon.Id));
}
@@ -320,7 +322,7 @@ namespace WowUp.WPF.ViewModels
private void UpdateDisplayAddons(IList<AddonListItemViewModel> addons)
{
lock (LoadLock)
lock (DisplayAddonsLock)
{
DisplayAddons.Clear();