Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid Dispose[Async]() from being called multiple times. #575

Merged
merged 2 commits into from
Jan 6, 2022
Merged

Avoid Dispose[Async]() from being called multiple times. #575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4183831
Make apps dispose just once
FrankBakkerNl Jan 5, 2022
44dfe71
Merge branch 'dev' into fix_multiple_dispose
FrankBakkerNl Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/App/NetDaemon.App/Common/ApplicationContexts/ApplicationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace NetDaemon.Common
public abstract class ApplicationContext : IAsyncDisposable, IApplicationMetadata, IApplicationContext
{
private readonly IServiceScope? _serviceScope;
private bool _disposed;

private Action? _configProvider;

Expand Down Expand Up @@ -152,12 +153,16 @@ public async Task InitializeAsync()
/// <inheritdoc />
public async ValueTask DisposeAsync()
{
if (_disposed) return;

_disposed = true;

if (ApplicationInstance is IAsyncDisposable asyncDisposable)
{
await asyncDisposable.DisposeAsync().ConfigureAwait(false);
}

if (ApplicationInstance is IDisposable disposable)
else if (ApplicationInstance is IDisposable disposable)
{
disposable.Dispose();
}
Expand Down