Fix trying to read custom icons from DSi/3DS SD when detected, regardless of where TWLMenu++ is run from

Author: RocketRobz

quickmenu/arm9/source/iconTitle.cpp

@@ -28,7 +28,7 @@
 #include <gl2d.h>
 #include "common/tonccpy.h"
 #include "common/twlmenusettings.h"
-#include "common/flashcard.h"
+#include "common/systemdetails.h"
 #include "graphics/graphics.h"
 #include "graphics/fontHandler.h"
 #include "common/lodepng.h"
@@ -315,7 +315,7 @@ void getGameInfo(int num, bool isDir, const char* name, bool fromArgv)
 		bool customIconGood = false;
 
 		// First try banner bin
-		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sdFound() ? "sd" : "fat", name);
+		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sys().isRunFromSD() ? "sd" : "fat", name);
 		customIcon[num] = (access(customIconPath, F_OK) == 0);
 		if (customIcon[num]) {
 			customIcon[num] = 2; // custom icon is a banner bin
@@ -342,7 +342,7 @@ void getGameInfo(int num, bool isDir, const char* name, bool fromArgv)
 			}
 		} else {
 			// If no banner bin, try png
-			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sdFound() ? "sd" : "fat", name);
+			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sys().isRunFromSD() ? "sd" : "fat", name);
 			customIcon[num] = (access(customIconPath, F_OK) == 0);
 			if (customIcon[num]) {
 				std::vector<unsigned char> image;

romsel_aktheme/arm9/source/iconTitle.cpp

@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <gl2d.h>
 #include "common/bootstrapsettings.h"
-#include "common/flashcard.h"
 #include "common/systemdetails.h"
 #include "common/tonccpy.h"
 #include "common/twlmenusettings.h"
@@ -958,7 +957,7 @@ void getGameInfo(int num, bool isDir, const char* name, bool fromArgv)
 		bool customIconGood = false;
 
 		// First try banner bin
-		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sdFound() ? "sd" : "fat", name);
+		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sys().isRunFromSD() ? "sd" : "fat", name);
 		if (access(customIconPath, F_OK) == 0) {
 			customIcon[num] = 2; // custom icon is a banner bin
 			FILE *file = fopen(customIconPath, "rb");
@@ -1000,7 +999,7 @@ void getGameInfo(int num, bool isDir, const char* name, bool fromArgv)
 			}
 		} else if (customIcon[num] == 0) {
 			// If no banner bin, try png
-			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sdFound() ? "sd" : "fat", name);
+			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sys().isRunFromSD() ? "sd" : "fat", name);
 			customIcon[num] = (access(customIconPath, F_OK) == 0);
 			if (customIcon[num]) {
 				std::vector<unsigned char> image;

romsel_dsimenutheme/arm9/source/iconTitle.cpp

@@ -25,7 +25,6 @@
 #include "common/twlmenusettings.h"
 #include "common/bootstrapsettings.h"
 #include "common/systemdetails.h"
-#include "common/flashcard.h"
 #include <gl2d.h>
 #include "common/tonccpy.h"
 #include "fileBrowse.h"
@@ -216,7 +215,7 @@ void getGameInfo(bool isDir, const char *name, int num, bool fromArgv) {
 		bool customIconGood = false;
 
 		// First try banner bin
-		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sdFound() ? "sd" : "fat", name);
+		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sys().isRunFromSD() ? "sd" : "fat", name);
 		if (access(customIconPath, F_OK) == 0) {
 			customIcon[num] = 2; // custom icon is a banner bin
 			FILE *file = fopen(customIconPath, "rb");
@@ -258,7 +257,7 @@ void getGameInfo(bool isDir, const char *name, int num, bool fromArgv) {
 			}
 		} else if (customIcon[num] == 0) {
 			// If no banner bin, try png
-			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sdFound() ? "sd" : "fat", name);
+			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sys().isRunFromSD() ? "sd" : "fat", name);
 			customIcon[num] = (access(customIconPath, F_OK) == 0);
 			if (customIcon[num]) {
 				std::vector<unsigned char> image;

romsel_r4theme/arm9/source/iconTitle.cpp

@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <gl2d.h>
 #include "common/bootstrapsettings.h"
-#include "common/flashcard.h"
 #include "common/systemdetails.h"
 #include "common/tonccpy.h"
 #include "common/twlmenusettings.h"
@@ -924,7 +923,7 @@ void getGameInfo(bool isDir, const char* name, bool fromArgv)
 		bool customIconGood = false;
 
 		// First try banner bin
-		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sdFound() ? "sd" : "fat", name);
+		snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.bin", sys().isRunFromSD() ? "sd" : "fat", name);
 		customIcon = (access(customIconPath, F_OK) == 0);
 		if (customIcon) {
 			customIcon = 2; // custom icon is a banner bin
@@ -951,7 +950,7 @@ void getGameInfo(bool isDir, const char* name, bool fromArgv)
 			}
 		} else {
 			// If no banner bin, try png
-			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sdFound() ? "sd" : "fat", name);
+			snprintf(customIconPath, sizeof(customIconPath), "%s:/_nds/TWiLightMenu/icons/%s.png", sys().isRunFromSD() ? "sd" : "fat", name);
 			customIcon = (access(customIconPath, F_OK) == 0);
 			if (customIcon) {
 				std::vector<unsigned char> image;