1 files changed, 18 insertions, 3 deletions

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 9ead2a0a..2cb27730 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -854,6 +854,13 @@ CMenuManager::Draw()
 				str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
 			break;
 		default:
+#ifdef CUSTOM_FRONTEND_OPTIONS
+			if (aScreens[m_nCurrScreen].m_aEntries[0].m_SaveSlot == SAVESLOT_CFO) {
+				FrontendOption& option = customFrontendOptions[aScreens[m_nCurrScreen].m_aEntries[0].m_TargetMenu];
+				str = (wchar*)option.leftText;
+			}
+			else
+#endif
 			str = TheText.Get(aScreens[m_nCurrScreen].m_aEntries[0].m_EntryName);
 			break;
 		}
@@ -3443,6 +3450,7 @@ CMenuManager::LoadSettings()
 			CFileMgr::Read(fileHandle, m_PrefsSkinFile, 256);
 			CFileMgr::Read(fileHandle, (char*)&m_ControlMethod, 1);
 			CFileMgr::Read(fileHandle, (char*)&m_PrefsLanguage, 1);
+/*
 #ifdef CUSTOM_FRONTEND_OPTIONS
 			for (int i = 0; i < numCustomFrontendOptions; i++) {
 				FrontendOption& option = customFrontendOptions[i];
@@ -3456,6 +3464,7 @@ CMenuManager::LoadSettings()
 			CFileMgr::Read(fileHandle, (char *)&CMenuManager::m_PrefsIslandLoading, 1);
 			CMenuManager::m_DisplayIslandLoading = CMenuManager::m_PrefsIslandLoading;
 #endif
+*/
 		}
 	}
 
@@ -3546,6 +3555,7 @@ CMenuManager::SaveSettings()
 		CFileMgr::Write(fileHandle, m_PrefsSkinFile, 256);
 		CFileMgr::Write(fileHandle, (char*)&m_ControlMethod, 1);
 		CFileMgr::Write(fileHandle, (char*)&m_PrefsLanguage, 1);
+/*
 #ifdef CUSTOM_FRONTEND_OPTIONS
 		for (int i = 0; i < numCustomFrontendOptions; i++) {
 			FrontendOption &option = customFrontendOptions[i];
@@ -3557,6 +3567,7 @@ CMenuManager::SaveSettings()
 #ifdef NO_ISLAND_LOADING
 		CFileMgr::Write(fileHandle, (char *)&CMenuManager::m_PrefsIslandLoading, 1);
 #endif
+*/
 	}
 
 	CFileMgr::CloseFile(fileHandle);
@@ -3880,7 +3891,10 @@ CMenuManager::Process(void)
 					MouseButtonJustClicked = 4;
 				else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
 					MouseButtonJustClicked = 5;
-				// TODO two more buttons
+				else if (CPad::GetPad(0)->GetMouseX1JustUp())
+					MouseButtonJustClicked = 6;
+				else if (CPad::GetPad(0)->GetMouseX2JustUp())
+					MouseButtonJustClicked = 7;
 
 				JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
 
@@ -5106,7 +5120,8 @@ CMenuManager::ProcessButtonPresses(void)
 							*option.value = option.lastSavedValue = option.displayedValue;
 
 						} else if (option.type == FEOPTION_DYNAMIC) {
-							option.buttonPressFunc(FEOPTION_ACTION_SELECT);
+							if (option.buttonPressFunc)
+								option.buttonPressFunc(FEOPTION_ACTION_SELECT);
 						} else if (option.type == FEOPTION_REDIRECT) {
 							ChangeScreen(option.to, option.option, true, option.fadeIn);
 						} else if (option.type == FEOPTION_GOBACK) {
@@ -5349,7 +5364,7 @@ CMenuManager::ProcessButtonPresses(void)
 							option.changeFunc(option.displayedValue);
 							*option.value = option.lastSavedValue = option.displayedValue;
 						}
-					} else if (option.type == FEOPTION_DYNAMIC) {
+					} else if (option.type == FEOPTION_DYNAMIC && option.buttonPressFunc) {
 						option.buttonPressFunc(changeValueBy > 0 ? FEOPTION_ACTION_RIGHT : FEOPTION_ACTION_LEFT);
 					}
 					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);