ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-15 11:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

potentially fix mac, fix cancel downloads

Browse source
This commit is contained in:
Stanley Dimant 2022-06-26 15:13:53 +02:00
parent 1a1aa5cac5
commit 085d918397
3 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MareSynchronos/Models/CachedPlayer.cs
View file

@ -43,7 +43,7 @@ public class CachedPlayer
}
}
private CancellationTokenSource _downloadCancellationTokenSource = new();
private CancellationTokenSource? _downloadCancellationTokenSource;
private string _lastGlamourerData = string.Empty;
@ -93,9 +93,12 @@ public class CachedPlayer
await _apiController.DownloadFiles(toDownloadReplacements, downloadToken);
}
if (_downloadCancellationTokenSource.Token.IsCancellationRequested)
if (downloadToken.IsCancellationRequested)
{
return;
}
ApplyCharacterData(e.CharacterData, moddedPaths);
ApplyCharacterData(e.CharacterData, moddedPaths);
}, downloadToken);
}
@ -152,6 +155,7 @@ public class CachedPlayer
{
Logger.Debug("Restoring state for " + PlayerName);
IsVisible = false;
_downloadCancellationTokenSource?.Dispose();
_watcher.RemovePlayerFromWatch(PlayerName);
_ipcManager.PenumbraRemoveTemporaryCollection(PlayerName);
_ipcManager.GlamourerRevertCharacterCustomization(PlayerName);