From ff09bde3b0ba9de1068f29b9d0dc2f9f437cae88 Mon Sep 17 00:00:00 2001
From: neonloop
Date: Fri, 27 Aug 2021 23:56:22 +0000
Subject: Fixes GBA save method

This was not set to libretro, so SRAM was not properly written.
---
 core.c           | 10 +++++-----
 overrides/gpsp.h |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core.c b/core.c
index a7e45d4..1a92c28 100644
--- a/core.c
+++ b/core.c
@@ -710,6 +710,7 @@ finish:
 }
 
 void core_unload_content(void) {
+	current_core.retro_unload_game();
 	if (temp_rom[0]) {
 		remove(temp_rom);
 		temp_rom[0] = '\0';
@@ -727,17 +728,16 @@ const char **core_extensions(void) {
 void core_unload(void) {
 	PA_INFO("Unloading core...\n");
 
-	core_unload_content();
-
-	string_list_free(extensions);
-	extensions = NULL;
-
 	if (current_core.initialized) {
 		sram_write();
+		core_unload_content();
 		current_core.retro_deinit();
 		current_core.initialized = false;
 	}
 
+	string_list_free(extensions);
+	extensions = NULL;
+
 	options_free();
 
 	if (current_core.handle) {
diff --git a/overrides/gpsp.h b/overrides/gpsp.h
index eac14c6..44a35e0 100644
--- a/overrides/gpsp.h
+++ b/overrides/gpsp.h
@@ -59,6 +59,7 @@ static const struct core_override_option gpsp_core_option_overrides[] = {
 	},
 	{
 		.key = "gpsp_save_method",
+		.default_value = "libretro",
 		.blocked = true
 	},
 	{ NULL }
-- 
cgit v1.2.3