Skip to content

Commit 8975826

Browse files
committed
Moved title logic to resolve race condition
1 parent 2d6093e commit 8975826

2 files changed

Lines changed: 7 additions & 20 deletions

File tree

src/EventLogExpert/MainPage.xaml.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,33 +79,29 @@ public MainPage(
7979

8080
activeLogsState.Select(e => e.ActiveLogs);
8181

82-
activeLogsState.SelectedValueChanged += (sender, activeLogs) =>
82+
activeLogsState.SelectedValueChanged += (_, activeLogs) =>
8383
MainThread.InvokeOnMainThreadAsync(() =>
84-
{
85-
appTitleService.SetLogName(
86-
activeLogs == ImmutableDictionary<string, EventLogData>.Empty ?
87-
null : string.Join(" | ", activeLogs.Values.Select(l => l.Name)));
88-
});
84+
appTitleService.SetLogName(activeLogs.Count <= 0 ? null : string.Join(" | ", activeLogs.Values.Select(l => l.Name))));
8985

9086
continuouslyUpdateState.Select(e => e.ContinuouslyUpdate);
9187

92-
continuouslyUpdateState.SelectedValueChanged += (sender, continuouslyUpdate) =>
88+
continuouslyUpdateState.SelectedValueChanged += (_, continuouslyUpdate) =>
9389
MainThread.InvokeOnMainThreadAsync(() =>
9490
ContinuouslyUpdateMenuItem.Text = $"Continuously Update{(continuouslyUpdate ? " ✓" : "")}");
9591

9692
filterPaneIsEnabledState.Select(e => e.IsEnabled);
9793

98-
filterPaneIsEnabledState.SelectedValueChanged += (sender, isEnabled) =>
94+
filterPaneIsEnabledState.SelectedValueChanged += (_, isEnabled) =>
9995
MainThread.InvokeOnMainThreadAsync(() =>
10096
ShowAllEventsMenuItem.Text = $"Show All Events{(isEnabled ? "" : " ✓")}");
10197

10298
filterPaneIsXmlEnabledState.Select(e => e.IsXmlEnabled);
10399

104-
filterPaneIsXmlEnabledState.SelectedValueChanged += async (sender, isEnabled) =>
100+
filterPaneIsXmlEnabledState.SelectedValueChanged += async (_, isEnabled) =>
105101
await MainThread.InvokeOnMainThreadAsync(() =>
106102
EnableXmlFilteringMenuItem.Text = $"Enable Xml Filtering{(isEnabled ? " ✓" : "")}");
107103

108-
_databaseService.LoadedDatabasesChanged += (sender, loadedProviders) =>
104+
_databaseService.LoadedDatabasesChanged += (_, loadedProviders) =>
109105
databaseCollectionProvider.SetActiveDatabases(loadedProviders.Select(path =>
110106
Path.Join(fileLocationOptions.DatabasePath, path)));
111107

src/EventLogExpert/Shared/MainLayout.razor.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@ public sealed partial class MainLayout
2323
protected override async Task OnInitializedAsync()
2424
{
2525
await UpdateService.CheckForUpdates(Settings.IsPreReleaseEnabled, false);
26+
AppTitleService.SetLogName(null);
2627

2728
await base.OnInitializedAsync();
2829
}
2930

30-
protected override async Task OnAfterRenderAsync(bool firstRender)
31-
{
32-
if (firstRender)
33-
{
34-
AppTitleService.SetLogName(null);
35-
}
36-
37-
await base.OnAfterRenderAsync(firstRender);
38-
}
39-
4031
private void HandleKeyUp(KeyboardEventArgs args)
4132
{
4233
// https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values

0 commit comments

Comments
 (0)