Added cleanup when registering service event handlers

3 files changed, 12 insertions, 1 deletions

diff --git a/Pages/Component/TagSelectDialog.razor b/Pages/Component/TagSelectDialog.razor
index e6e78a4..f1c294c 100644
--- a/Pages/Component/TagSelectDialog.razor
+++ b/Pages/Component/TagSelectDialog.razor
@@ -180,5 +180,8 @@
             StateHasChanged();
         });
 
-    public void Dispose() => db.Dispose();
+    public void Dispose() {
+        db.Dispose();
+        userService.ShowNsfwChanged -= ShowNsfwChanged;
+    }
 }
diff --git a/Pages/Gallery.razor b/Pages/Gallery.razor
index d89fd3d..e5b1e7b 100644
--- a/Pages/Gallery.razor
+++ b/Pages/Gallery.razor
@@ -4,6 +4,7 @@
 @inject ITagService tagService
 @inject ISearchService searchService
 @inject IUserService userService
+@implements IDisposable
 
 <PageTitle>@(Query is null ? "Gallery" : "Search Results")</PageTitle>
 
@@ -68,4 +69,7 @@
             StateHasChanged();
         });
     }
+
+    public void Dispose() =>
+        userService.ShowNsfwChanged -= ShowNsfwChanged;
 }
diff --git a/Pages/TagDefinitions.razor b/Pages/TagDefinitions.razor
index 7ff870a..fad1450 100644
--- a/Pages/TagDefinitions.razor
+++ b/Pages/TagDefinitions.razor
@@ -2,6 +2,7 @@
 @inject IDbContextFactory<HBContext> dbFactory
 @inject ITagService tagService
 @inject IUserService userService
+@implements IDisposable
 
 <PageTitle>Tag Definitions</PageTitle>
 
@@ -218,4 +219,7 @@
             LoadTags();
             StateHasChanged();
         });
+
+    public void Dispose() =>
+        userService.ShowNsfwChanged -= ShowNsfwChanged;
 }