From 52eb3e426625aff0bab2b79d50db5a412cf0a941 Mon Sep 17 00:00:00 2001 From: Sergiotarxz Date: Sat, 25 Mar 2023 00:47:02 +0100 Subject: [PATCH] Fixing segfault caused by the previous commit for not initing the mInputMap --- src/core_controller.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core_controller.c b/src/core_controller.c index 6167aee..3e193aa 100644 --- a/src/core_controller.c +++ b/src/core_controller.c @@ -37,6 +37,8 @@ msCoreControllerLoadGame (const unsigned char *rom, size_t rom_len, goto loadGameReturn; } core->init(core); + + mInputMapInit(&core->inputMap, &GBAInputInfo); mInputBindKey(&core->inputMap, 0, MSGBA_KEY_A, GBA_KEY_A); mInputBindKey(&core->inputMap, 0, MSGBA_KEY_B, GBA_KEY_B); mInputBindKey(&core->inputMap, 0, MSGBA_KEY_L, GBA_KEY_L); @@ -104,6 +106,7 @@ msCoreControllerDestroy(struct msCoreController **controller_ptr) { mCoreThreadJoin(&controller->threadContext); if (controller->threadContext.core) { struct mCore *core = controller->threadContext.core; + mInputMapDeinit(&core->inputMap); core->deinit(core); } free(controller->outputBuffer);