Skip to content

Commit fdc27c4

Browse files
authored
Fix slot1 not loading in DS Classic Menu (#2335)
1 parent c2119d4 commit fdc27c4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

quickmenu/arm9/source/main.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,21 +1053,21 @@ void printLastPlayedText(int num) {
10531053
printSmall(false, BOX_PX, iconYpos[num] + BOX_PY - (calcSmallFontHeight(STR_LAST_PLAYED_HERE) / 2), STR_LAST_PLAYED_HERE, Alignment::center);
10541054
}
10551055

1056-
void refreshNdsCard() {
1056+
void refreshNdsCard(bool refreshBoxArt) {
10571057
if (cardRefreshed) return;
10581058

1059-
if (sys().arm7SCFGLocked() && ms().showBoxArt) {
1059+
if (sys().arm7SCFGLocked() && refreshBoxArt) {
10601060
loadBoxArt("nitro:/graphics/boxart_unknown.png", true);
10611061
} else {
10621062
my_cardReset(true);
1063-
if ((cardInit() == 0) && ms().showBoxArt) {
1063+
if ((cardInit() == 0) && refreshBoxArt) {
10641064
char game_TID[5] = {0};
10651065
tonccpy(&game_TID, ndsCardHeader.gameCode, 4);
10661066

10671067
char boxArtPath[256];
10681068
sprintf (boxArtPath, (sys().isRunFromSD() ? "sd:/_nds/TWiLightMenu/boxart/%s.png" : "fat:/_nds/TWiLightMenu/boxart/%s.png"), game_TID);
10691069
loadBoxArt(boxArtPath, true); // Load box art
1070-
} else if (ms().showBoxArt) {
1070+
} else if (refreshBoxArt) {
10711071
loadBoxArt("nitro:/graphics/boxart_unknown.png", true);
10721072
}
10731073
}
@@ -1616,12 +1616,12 @@ int dsClassicMenu(void) {
16161616
loadBoxArt(boxArtPath[ms().previousUsedDevice], ms().previousUsedDevice); // Load box art
16171617
}
16181618

1619-
if (isDSiMode() && !flashcardFound() && ms().slot1Launched) {
1619+
if (isDSiMode() && !flashcardFound()) {
16201620
if (REG_SCFG_MC == 0x11) {
16211621
cardEjected = true;
1622-
if (ms().showBoxArt) loadBoxArt("nitro:/graphics/boxart_unknown.png", true);
1622+
if (ms().showBoxArt && ms().slot1Launched) loadBoxArt("nitro:/graphics/boxart_unknown.png", true);
16231623
} else {
1624-
refreshNdsCard();
1624+
refreshNdsCard(ms().showBoxArt && ms().slot1Launched);
16251625
}
16261626
}
16271627

@@ -1659,7 +1659,7 @@ int dsClassicMenu(void) {
16591659
cardEjected = true;
16601660
updateMenuText = true;
16611661
} else if (cardEjected) {
1662-
refreshNdsCard();
1662+
refreshNdsCard(ms().showBoxArt);
16631663
updateMenuText = true;
16641664
}
16651665
}

0 commit comments

Comments
 (0)