diff --git a/MareSynchronos/FileCache/FileCompactor.cs b/MareSynchronos/FileCache/FileCompactor.cs index 67e3a01..7fea1a0 100644 --- a/MareSynchronos/FileCache/FileCompactor.cs +++ b/MareSynchronos/FileCache/FileCompactor.cs @@ -69,7 +69,7 @@ public sealed class FileCompactor { bool ntfs = isNTFS ?? string.Equals(new DriveInfo(new FileInfo(filePath).Directory!.Root.FullName).DriveFormat, "NTFS", StringComparison.OrdinalIgnoreCase); - if (_dalamudUtilService.IsWine.Value || !ntfs) return new FileInfo(filePath).Length; + if (_dalamudUtilService.IsWine || !ntfs) return new FileInfo(filePath).Length; var clusterSize = GetClusterSize(filePath); if (clusterSize == -1) return new FileInfo(filePath).Length; @@ -82,7 +82,7 @@ public sealed class FileCompactor { await File.WriteAllBytesAsync(filePath, decompressedFile, token).ConfigureAwait(false); - if (_dalamudUtilService.IsWine.Value || !_mareConfigService.Current.UseCompactor) + if (_dalamudUtilService.IsWine || !_mareConfigService.Current.UseCompactor) { return; } diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs index 20ccfcd..33dea0e 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -567,8 +567,7 @@ public class SettingsUi : WindowMediatorSubscriberBase _ = Task.Run(() => { _fileCompactor.CompactStorage(compress: true); - CancellationTokenSource cts = new(); - _cacheMonitor.RecalculateFileCacheSize(cts.Token); + _cacheMonitor.RecalculateFileCacheSize(CancellationToken.None); }); } UiSharedService.AttachToolTip("This will run compression on all files in your current Mare Storage." + Environment.NewLine @@ -580,7 +579,7 @@ public class SettingsUi : WindowMediatorSubscriberBase { _fileCompactor.CompactStorage(compress: false); CancellationTokenSource cts = new(); - _cacheMonitor.RecalculateFileCacheSize(cts.Token); + _cacheMonitor.RecalculateFileCacheSize(CancellationToken.None); }); } UiSharedService.AttachToolTip("This will run decompression on all files in your current Mare Storage.");