From aaf12cad27f3b90c68ac955b5ac0194f10b71682 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 19 Sep 2016 13:52:11 -0700 Subject: [PATCH] GBA Savedata: Only unmap savedata if present --- CHANGES | 1 + src/gba/savedata.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 65bd04690..be6c53dd1 100644 --- a/CHANGES +++ b/CHANGES @@ -42,6 +42,7 @@ Bugfixes: - GBA Video: Fix out-of-order OBJWIN - GBA: Count up timers should not count themselves - GBA Savedata: Fix savedata sync timer + - GBA Savedata: Only unmap savedata if present Misc: - 3DS: Use blip_add_delta_fast for a small speed improvement - OpenGL: Log shader compilation failure diff --git a/src/gba/savedata.c b/src/gba/savedata.c index cfa410ae4..3308b8cf2 100644 --- a/src/gba/savedata.c +++ b/src/gba/savedata.c @@ -46,7 +46,9 @@ void GBASavedataInit(struct GBASavedata* savedata, struct VFile* vf) { void GBASavedataDeinit(struct GBASavedata* savedata) { if (savedata->vf) { size_t size = GBASavedataSize(savedata); - savedata->vf->unmap(savedata->vf, savedata->data, size); + if (savedata->data) { + savedata->vf->unmap(savedata->vf, savedata->data, size); + } savedata->vf = NULL; } else { switch (savedata->type) {