Bug fix

Author: RocketRobz

romsel_dsimenutheme/arm9/source/graphics/graphics.cpp

@@ -1252,9 +1252,9 @@ static int currentBootstrapPhoto = 0;
 void loadPhoto(const std::string &path, const bool bufferOnly);
 void loadBootstrapScreenshot(FILE *file, const bool bufferOnly);
 
-void loadPhotoList() {
+bool loadPhotoList() {
 	if (!tex().photoBuffer()) {
-		return;
+		return false;
 	}
 
 	DIR *dir;
@@ -1284,7 +1284,7 @@ void loadPhotoList() {
 			currentPhotoPath = photoList[rand() / ((RAND_MAX + 1u) / photoList.size())];
 			loadPhoto(currentPhotoPath, false);
 			currentPhotoIsBootstrap = false;
-			return;
+			return true;
 		}
 	}
 
@@ -1307,7 +1307,7 @@ void loadPhotoList() {
 			fseek(file, 0x200 + 0x18400 * currentBootstrapPhoto, SEEK_SET);
 			loadBootstrapScreenshot(file, false);
 			currentPhotoIsBootstrap = true;
-			return;
+			return true;
 		}
 	}
 
@@ -1317,6 +1317,7 @@ void loadPhotoList() {
 	currentPhotoPath = path;
 	loadPhoto(path, false);
 	currentPhotoIsBootstrap = false;
+	return true;
 }
 
 void reloadPhoto() {

romsel_dsimenutheme/arm9/source/graphics/graphics.h

@@ -29,7 +29,7 @@ void SetBrightness(u8 screen, s8 bright);
 void drawCurrentDate();
 void drawCurrentTime();
 
-void loadPhotoList();
+bool loadPhotoList();
 void reloadPhoto();
 void clearBoxArt();
 void graphicsInit();

romsel_dsimenutheme/arm9/source/main.cpp

@@ -907,18 +907,18 @@ void customSleep() {
 	powerOn(PM_BACKLIGHT_BOTTOM);
 	if (!ms().macroMode && ms().showPhoto && tc().renderPhoto()) {
 		srand(time(NULL));
-		loadPhotoList();
-
-		extern bool boxArtLoaded;
-		extern bool showLshoulder;
-		extern bool showRshoulder;
-		extern int file_count;
-
-		boxArtLoaded = false;
-		showLshoulder = (PAGENUM != 0);
-		showRshoulder = (file_count > 40 + PAGENUM * 40);
-		if (ms().theme != TWLSettings::EThemeHBL) {
-			tex().drawShoulders(showLshoulder, showRshoulder);
+		if (loadPhotoList()) {
+			extern bool boxArtLoaded;
+			extern bool showLshoulder;
+			extern bool showRshoulder;
+			extern int file_count;
+
+			boxArtLoaded = false;
+			showLshoulder = (PAGENUM != 0);
+			showRshoulder = (file_count > 40 + PAGENUM * 40);
+			if (ms().theme != TWLSettings::EThemeHBL) {
+				tex().drawShoulders(showLshoulder, showRshoulder);
+			}
 		}
 	}
 	fadeType = true;