From 0956e62b9b7fb10337cb16651e81569d3cc852a0 Mon Sep 17 00:00:00 2001 From: d0k3 Date: Fri, 31 Mar 2017 03:15:03 +0200 Subject: [PATCH] Fix: illegal chars in all cart names --- source/common/common.h | 2 +- source/gamecart/gamecart.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/common/common.h b/source/common/common.h index 4fd1327..7e81e99 100644 --- a/source/common/common.h +++ b/source/common/common.h @@ -53,7 +53,7 @@ // GodMode9 version -#define VERSION "1.0.7" +#define VERSION "1.0.8" // Maximum payload size (arbitrary value!) #define SELF_MAX_SIZE (320 * 1024) // 320kB diff --git a/source/gamecart/gamecart.c b/source/gamecart/gamecart.c index 3ad3746..820fdaf 100644 --- a/source/gamecart/gamecart.c +++ b/source/gamecart/gamecart.c @@ -45,15 +45,14 @@ u32 GetCartName(char* name, CartData* cdata) { CartDataCtr* cdata_i = (CartDataCtr*)(void*) cdata; NcsdHeader* ncsd = &(cdata_i->ncsd); snprintf(name, 24, "%016llX_v%02lu", ncsd->mediaId, cdata_i->rom_version); - return 0; } else if (cdata->cart_type & CART_NTR) { CartDataNtrTwl* cdata_i = (CartDataNtrTwl*)(void*) cdata; TwlHeader* nds = &(cdata_i->ntr_header); snprintf(name, 24, "%.12s_%.6s_%02u", nds->game_title, nds->game_code, nds->rom_version); - for (char* c = name; *c != '\0'; c++) - if ((*c == ':') || (*c == '*') || (*c == '?') || (*c == '/') || (*c == '\\')) *c = '_'; - return 0; } else return 1; + for (char* c = name; *c != '\0'; c++) + if ((*c == ':') || (*c == '*') || (*c == '?') || (*c == '/') || (*c == '\\')) *c = '_'; + return 0; } u32 InitCardRead(CartData* cdata) {