t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix DtrBar removal/addition

Browse Source
This commit is contained in:
rootdarkarchon
2023-07-10 16:09:41 +02:00
parent 417c08f9b2
commit 405c0968da
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MareSynchronos/UI/DtrEntry.cs
View File

@@ -13,16 +13,18 @@ public sealed class DtrEntry : IDisposable, IHostedService
private readonly ApiController _apiController; private readonly ApiController _apiController;
private readonly CancellationTokenSource _cancellationTokenSource = new(); private readonly CancellationTokenSource _cancellationTokenSource = new();
private readonly ILogger<DtrEntry> _logger; private readonly ILogger<DtrEntry> _logger;
private readonly DtrBar _dtrBar;
private readonly ConfigurationServiceBase<MareConfig> _configService; private readonly ConfigurationServiceBase<MareConfig> _configService;
private readonly Lazy<DtrBarEntry> _entry; private Lazy<DtrBarEntry> _entry;
private readonly PairManager _pairManager; private readonly PairManager _pairManager;
private Task? _runTask; private Task? _runTask;
private string? _text; private string? _text;
public DtrEntry(ILogger<DtrEntry> logger, DtrBar dtrBar, ConfigurationServiceBase<MareConfig> configService, PairManager pairManager, ApiController apiController) public DtrEntry(ILogger<DtrEntry> logger, DtrBar dtrBar, ConfigurationServiceBase<MareConfig> configService, PairManager pairManager, ApiController apiController)
{ {
_entry = new(() => dtrBar.Get("Mare Synchronos"));
_logger = logger; _logger = logger;
_dtrBar = dtrBar;
_entry = new(() => _dtrBar.Get("Mare Synchronos"));
_configService = configService; _configService = configService;
_pairManager = pairManager; _pairManager = pairManager;
_apiController = apiController; _apiController = apiController;
@@ -64,10 +66,14 @@ public sealed class DtrEntry : IDisposable, IHostedService
private void Clear() private void Clear()
{ {
if (!_entry.IsValueCreated) return;
_text = null; _text = null;
_logger.LogInformation("Clearing entry");
_entry.Value.Shown = false; _entry.Value.Shown = false;
_entry.Value.Text = null; _entry.Value.Text = null;
_entry.Value.Dispose();
_entry = new(() => _dtrBar.Get("Mare Synchronos"));
} }
private async Task RunAsync() private async Task RunAsync()
@@ -84,8 +90,10 @@ public sealed class DtrEntry : IDisposable, IHostedService
{ {
if (!_configService.Current.EnableDtrEntry) if (!_configService.Current.EnableDtrEntry)
{ {
if (_entry.Value.Shown) if (_entry.IsValueCreated && _entry.Value.Shown)
{ {
_logger.LogInformation("Disabling entry");
Clear(); Clear();
} }
return; return;
@@ -93,6 +101,7 @@ public sealed class DtrEntry : IDisposable, IHostedService
if (!_entry.Value.Shown) if (!_entry.Value.Shown)
{ {
_logger.LogInformation("Showing entry");
_entry.Value.Shown = true; _entry.Value.Shown = true;
} }