Skip to content

Commit

Permalink
gui: fix vmc name not displaying upon first entering the menu if one …
Browse files Browse the repository at this point in the history
…is already set
  • Loading branch information
KrahJohlito committed Nov 1, 2019
1 parent e380881 commit a72561c
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/guigame.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static char vmc2[32];
static char hexDiscID[15];
static char configSource[32];

// forward declartions.
// forward declarations.
static void guiGameLoadGSMConfig(config_set_t *configSet, config_set_t *configGame);
static void guiGameLoadCheatsConfig(config_set_t *configSet, config_set_t *configGame);
#ifdef PADEMU
Expand Down Expand Up @@ -257,13 +257,13 @@ static int guiGameShowVMCConfig(int id, item_list_t *support, char *VMCName, int

void guiGameShowVMCMenu(int id, item_list_t *support)
{
int result = COMPAT_NOEXIT;

diaSetLabel(diaVMCConfig, COMPAT_VMC1_DEFINE, vmc1);
diaSetLabel(diaVMCConfig, COMPAT_VMC2_DEFINE, vmc2);
int result = -1;

// show dialog
do {
diaSetLabel(diaVMCConfig, COMPAT_VMC1_DEFINE, vmc1);
diaSetLabel(diaVMCConfig, COMPAT_VMC2_DEFINE, vmc2);

if (strlen(vmc1))
diaSetLabel(diaVMCConfig, COMPAT_VMC1_ACTION, _l(_STR_RESET));
else
Expand Down Expand Up @@ -1115,16 +1115,18 @@ void guiGameLoadConfig(item_list_t *support, config_set_t *configSet)
guiGameLoadPadEmuConfig(configSet, configGame);
#endif
/// Find out the current game ID ///
hexid[0] = '\0';
configGetStrCopy(configSet, CONFIG_ITEM_DNAS, hexid, sizeof(hexid));
diaSetString(diaCompatConfig, COMPAT_GAMEID, hexid);

altStartup[0] = '\0';
configGetStrCopy(configSet, CONFIG_ITEM_ALTSTARTUP, altStartup, sizeof(altStartup));
diaSetString(diaCompatConfig, COMPAT_ALTSTARTUP, altStartup);

/// VMC ///
vmc1[0] = '\0';
configGetVMC(configSet, vmc1, sizeof(vmc1), 0);
diaSetLabel(diaVMCConfig, COMPAT_VMC1_DEFINE, vmc1);

vmc2[0] = '\0';
configGetVMC(configSet, vmc2, sizeof(vmc2), 1);
diaSetLabel(diaVMCConfig, COMPAT_VMC2_DEFINE, vmc2);
}

0 comments on commit a72561c

Please sign in to comment.