From 08dbcb0ce88ddffe03fa451f1b32d2160a9c11ad Mon Sep 17 00:00:00 2001
From: Zalo <cebolleto@gmail.com>
Date: Wed, 2 Jan 2019 17:16:32 +0100
Subject: [PATCH] removed ImageFolder from GCSettings because it can always be
 retrieved from GCSettings.PreviewImage, added function to get its value

---
 source/menu.cpp        |  9 +++------
 source/preferences.cpp |  3 ---
 source/snes9xgx.cpp    | 10 ++++++++++
 source/snes9xgx.h      |  3 ++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/source/menu.cpp b/source/menu.cpp
index 94d5b66..8a0ae99 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -948,7 +948,7 @@ static int MenuGameSelection()
 	GuiFileBrowser gameBrowser(330, 268);
 	gameBrowser.SetPosition(20, 98);
 	ResetBrowser();
-		
+	
 	GuiImage bgPreview(&bgPreviewImg);
 	bgPreview.SetPosition(365, 98);
 	
@@ -3999,16 +3999,13 @@ static int MenuSettingsMenu()
 			switch(GCSettings.PreviewImage)
 			{
 				case 0:	
-					sprintf(options.value[6], "Screenshots"); 
-					snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ScreenshotsFolder);
+					sprintf(options.value[6], "Screenshots");
 					break; 
 				case 1:	
-					sprintf(options.value[6], "Covers");	  
-					snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.CoverFolder);
+					sprintf(options.value[6], "Covers");
 					break; 
 				case 2:	
 					sprintf(options.value[6], "Artwork");
-					snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ArtworkFolder);
 					break; 
 			}
 			
diff --git a/source/preferences.cpp b/source/preferences.cpp
index 606fd3e..d659c35 100644
--- a/source/preferences.cpp
+++ b/source/preferences.cpp
@@ -132,7 +132,6 @@ preparePrefsData ()
 	createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder);
 	createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder);
 	createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder);
-	createXMLSetting("ImageFolder", "Image Folder", GCSettings.ImageFolder);
 	
 	createXMLSection("Network", "Network Settings");
 
@@ -317,7 +316,6 @@ decodePrefsData ()
 			loadXMLSetting(GCSettings.ScreenshotsFolder, "ScreenshotsFolder", sizeof(GCSettings.ScreenshotsFolder));
 			loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder));
 			loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder));
-			loadXMLSetting(GCSettings.ImageFolder, "ImageFolder", sizeof(GCSettings.ImageFolder));
 			
 			// Network Settings
 
@@ -433,7 +431,6 @@ DefaultSettings ()
 	sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files
 	sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files
 	sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files
-	sprintf (GCSettings.ImageFolder, "%s/screenshots", APPFOLDER);
 	GCSettings.AutoLoad = 1;
 	GCSettings.AutoSave = 1;
 
diff --git a/source/snes9xgx.cpp b/source/snes9xgx.cpp
index 1496a69..796b56b 100644
--- a/source/snes9xgx.cpp
+++ b/source/snes9xgx.cpp
@@ -558,3 +558,13 @@ int main(int argc, char *argv[])
 		} // emulation loop
 	} // main loop
 }
+
+char* ImageFolder()
+{
+	switch(GCSettings.PreviewImage)
+	{
+		case 1 : return GCSettings.CoverFolder; break;
+		case 2 : return GCSettings.ArtworkFolder; break;
+		default: return GCSettings.ScreenshotsFolder; break;
+	}
+}
diff --git a/source/snes9xgx.h b/source/snes9xgx.h
index 0f060df..ee8cd61 100644
--- a/source/snes9xgx.h
+++ b/source/snes9xgx.h
@@ -92,7 +92,6 @@ struct SGCSettings{
 	char	ScreenshotsFolder[MAXPATHLEN]; // Path to screenshots files
 	char	CoverFolder[MAXPATHLEN]; 	// Path to cover files
 	char	ArtworkFolder[MAXPATHLEN]; 	// Path to artwork files
-	char 	ImageFolder[MAXPATHLEN]; 	// Saved image folder path
 	int		AutoloadGame;
 
 	char	smbip[80];
@@ -123,6 +122,8 @@ struct SGCSettings{
 	int		Interpolation;
 };
 
+char* ImageFolder();
+
 void ExitApp();
 void ShutdownWii();
 bool SupportedIOS(u32 ios);