X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=b1ee4c7d797f6d0cdcfc52ddf652467a4882a96b;hb=7dea987c9689c441d8148b9523871f3fbbca2804;hp=fcf3846c085e23f69362fb9075c01a19c0993c3f;hpb=e989dfc6d5e44b0c61c481399e40833ffce6942a;p=pcsx_rearmed.git diff --git a/frontend/main.c b/frontend/main.c index fcf3846c..b1ee4c7d 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -307,7 +307,7 @@ static int cdidcmp(const char *id1, const char *id2) static void parse_cwcheat(void) { - char line[256], buf[64], name[64], *p; + char line[256], buf[256], name[256], *p; int newcheat = 1; u32 a, v; FILE *f; @@ -780,7 +780,7 @@ int emu_save_state(int slot) return ret; ret = SaveState(fname); -#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) /* XXX GPH hack */ +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) && !defined(__SWITCH__) /* XXX GPH hack */ sync(); #endif SysPrintf("* %s \"%s\" [%d]\n", @@ -883,8 +883,9 @@ static int _OpenPlugins(void) { MAKE_PATH(dotdir, "/.pcsx/plugins/", NULL); strcpy(info.EmuName, "PCSX"); - strncpy(info.CdromID, CdromId, 9); - strncpy(info.CdromLabel, CdromLabel, 9); + memcpy(info.CdromID, CdromId, 9); /* no \0 trailing character? */ + memcpy(info.CdromLabel, CdromLabel, 9); + info.CdromLabel[9] = '\0'; info.psxMem = psxM; info.GPU_showScreenPic = GPU_showScreenPic; info.GPU_displayText = GPU_displayText;