1 files changed, 12 insertions, 10 deletions
diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp
index a78544c88..4c7d3bb6e 100644
--- a/src/core/hle/service/bcat/backend/backend.cpp
+++ b/src/core/hle/service/bcat/backend/backend.cpp
@@ -5,22 +5,24 @@
 #include "common/hex_util.h"
 #include "common/logging/log.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_readable_event.h"
-#include "core/hle/kernel/k_writable_event.h"
+#include "core/hle/kernel/k_event.h"
 #include "core/hle/lock.h"
 #include "core/hle/service/bcat/backend/backend.h"
 
 namespace Service::BCAT {
 
-ProgressServiceBackend::ProgressServiceBackend(Kernel::KernelCore& kernel,
-                                               std::string_view event_name)
-    : update_event{kernel} {
-    Kernel::KAutoObject::Create(std::addressof(update_event));
-    update_event.Initialize("ProgressServiceBackend:UpdateEvent:" + std::string(event_name));
+ProgressServiceBackend::ProgressServiceBackend(Core::System& system, std::string_view event_name)
+    : service_context{system, "ProgressServiceBackend"} {
+    update_event = service_context.CreateEvent("ProgressServiceBackend:UpdateEvent:" +
+                                               std::string(event_name));
+}
+
+ProgressServiceBackend::~ProgressServiceBackend() {
+    service_context.CloseEvent(update_event);
 }
 
 Kernel::KReadableEvent& ProgressServiceBackend::GetEvent() {
-    return update_event.GetReadableEvent();
+    return update_event->GetReadableEvent();
 }
 
 DeliveryCacheProgressImpl& ProgressServiceBackend::GetImpl() {
@@ -88,9 +90,9 @@ void ProgressServiceBackend::FinishDownload(ResultCode result) {
 void ProgressServiceBackend::SignalUpdate() {
     if (need_hle_lock) {
         std::lock_guard lock(HLE::g_hle_lock);
-        update_event.GetWritableEvent().Signal();
+        update_event->GetWritableEvent().Signal();
     } else {
-        update_event.GetWritableEvent().Signal();
+        update_event->GetWritableEvent().Signal();
     }
 }