From a82c390fe97e24e2fdf71ce781a74cf7cdcada31 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 18 Jun 2023 21:48:35 -0700 Subject: [PATCH] Scripting: Detach adapter peripherals when detaching adapter --- src/core/scripting.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/scripting.c b/src/core/scripting.c index 0b3150039..e2d518b3a 100644 --- a/src/core/scripting.c +++ b/src/core/scripting.c @@ -1053,7 +1053,11 @@ void mScriptContextDetachCore(struct mScriptContext* context) { if (!value) { return; } - _clearMemoryMap(context, value->value.opaque, true); + + struct mScriptCoreAdapter* adapter = value->value.opaque; + _clearMemoryMap(context, adapter, true); + adapter->core->setPeripheral(adapter->core, mPERIPH_RUMBLE, adapter->oldRumble); + mScriptContextRemoveGlobal(context, "emu"); }