all repos — mgba @ 729c5fd73a7e6ecb40625c36249d1d4dac4fda57

mGBA Game Boy Advance Emulator

3DS: Fix crash with libctru 2.0 when exiting
Vicki Pfau vi@endrift.com
Sat, 08 Aug 2020 04:33:57 -0700
commit

729c5fd73a7e6ecb40625c36249d1d4dac4fda57

parent

00321dd9de6d8c93090c601e5b44fabde2550028

2 files changed, 1 insertions(+), 15 deletions(-)

jump to
M CHANGESCHANGES

@@ -1,6 +1,7 @@

0.8.4: (Future) Other fixes: - 3DS: Redo video sync to be more precise + - 3DS: Fix crash with libctru 2.0 when exiting - Qt: Add dummy English translation file (fixes mgba.io/i/1469) - mGUI: Fix closing down a game if an exit is signalled - VFS: Fix directory node listing on some filesystems
M src/platform/3ds/main.csrc/platform/3ds/main.c

@@ -106,7 +106,6 @@ static C3D_Tex upscaleBufferTex;

static bool interframeBlending = false; static bool sgbCrop = false; -static aptHookCookie cookie; static bool core2; static bool _initGpu(void) {

@@ -182,18 +181,6 @@

camExit(); ndspExit(); ptmuExit(); -} - -static void _aptHook(APT_HookType hook, void* user) { - UNUSED(user); - switch (hook) { - case APTHOOK_ONEXIT: - _cleanup(); - exit(0); - break; - default: - break; - } } static void _map3DSKey(struct mInputMap* map, int ctrKey, enum GBAKey key) {

@@ -824,8 +811,6 @@ camera.d.requestImage = _requestImage;

camera.buffer = NULL; camera.bufferSize = 0; camera.cam = SELECT_IN1; - - aptHook(&cookie, _aptHook, 0); ptmuInit(); camInit();