Merge pull request #11625 from phire/eventhook_nodiscard

Fix KillRenderer config changed regression
dolphin-emu · Mar 5, 2023 · 4acdbc0 · 4acdbc0
2 parents cecf2d2 + 901f12c
commit 4acdbc0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Source/Core/Common/HookableEvent.h b/Source/Core/Common/HookableEvent.h
@@ -91,7 +91,7 @@ class HookableEvent
 
 public:
   // Returns a handle that will unregister the listener when destroyed.
-  static EventHook Register(CallbackType callback, std::string name)
+  [[nodiscard]] static EventHook Register(CallbackType callback, std::string name)
   {
     auto& storage = GetStorage();
     std::lock_guard lock(storage.m_mutex);

diff --git a/Source/Core/VideoCommon/AbstractGfx.cpp b/Source/Core/VideoCommon/AbstractGfx.cpp
@@ -18,7 +18,8 @@ std::unique_ptr<AbstractGfx> g_gfx;
 
 AbstractGfx::AbstractGfx()
 {
-  ConfigChangedEvent::Register([this](u32 bits) { OnConfigChanged(bits); }, "AbstractGfx");
+  m_config_changed =
+      ConfigChangedEvent::Register([this](u32 bits) { OnConfigChanged(bits); }, "AbstractGfx");
 }
 
 bool AbstractGfx::IsHeadless() const

diff --git a/Source/Core/VideoCommon/AbstractGfx.h b/Source/Core/VideoCommon/AbstractGfx.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "Common/HookableEvent.h"
 #include "Common/MathUtil.h"
 
 #include "VideoCommon/RenderState.h"
@@ -166,6 +167,9 @@ class AbstractGfx
 protected:
   AbstractFramebuffer* m_current_framebuffer = nullptr;
   const AbstractPipeline* m_current_pipeline = nullptr;
+
+private:
+  Common::EventHook m_config_changed;
 };
 
 extern std::unique_ptr<AbstractGfx> g_gfx;