Fixed listener unregister

Author: KiritoDv

mod-src/src/demo.c

@@ -6,6 +6,9 @@
 #include "game/print.h"
 #include <stdio.h>
 
+ListenerID gFrameUpdateListenerID;
+ListenerID gRenderGamePostListenerID;
+
 void OnFrameUpdate(IEvent* event) {
     gMarioState->numCoins = 99;
 }
@@ -15,6 +18,11 @@ void OnGameRenderHud(IEvent* event) {
 }
 
 MOD_INIT() {
-    REGISTER_LISTENER(GameFrameUpdate, EVENT_PRIORITY_NORMAL, OnFrameUpdate);
-    REGISTER_LISTENER(RenderGamePost, EVENT_PRIORITY_NORMAL, OnGameRenderHud);
+    gFrameUpdateListenerID = REGISTER_LISTENER(GameFrameUpdate, EVENT_PRIORITY_NORMAL, OnFrameUpdate);
+    gRenderGamePostListenerID = REGISTER_LISTENER(RenderGamePost, EVENT_PRIORITY_NORMAL, OnGameRenderHud);
+}
+
+MOD_EXIT() {
+    UNREGISTER_LISTENER(GameFrameUpdate, gFrameUpdateListenerID);
+    UNREGISTER_LISTENER(RenderGamePost, gRenderGamePostListenerID);
 }

src/port/hooks/impl/EventSystem.h

@@ -87,6 +87,9 @@ typedef struct EventListener {
 #define REGISTER_LISTENER(eventType, priority, callback) \
     EventSystem_RegisterListener(eventType##ID, callback, priority, __FILE__, __LINE__);
 
+#define UNREGISTER_LISTENER(eventType, listenerID) \
+    EventSystem_UnregisterListener(eventType##ID, listenerID);
+
 #ifdef __cplusplus
 #include <vector>
 #include <unordered_map>