From 8634f272ed878cdabff2ceafa7e5b64d5f87a7e8 Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Thu, 14 Feb 2013 21:50:46 +0000
Subject: [PATCH] -lets really reboot wiiflow if we change a setting in the
 startup :P

---
 source/menu/menu.hpp            |  2 +-
 source/menu/menu_boot.cpp       | 14 +++++++++-----
 source/menu/menu_config_adv.cpp |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index 2ccee196..6af0e5cc 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -972,7 +972,7 @@ private:
 	void _CategorySettings(bool fromGameSet = false);
 	bool _Home();
 	bool _ExitTo();
-	void _Boot();
+	bool _Boot();
 	void _mainLoopCommon(bool withCF = false, bool adjusting = false);
 public:
 	void directlaunch(const char *GameID);
diff --git a/source/menu/menu_boot.cpp b/source/menu/menu_boot.cpp
index 460c3849..dbe7a112 100644
--- a/source/menu/menu_boot.cpp
+++ b/source/menu/menu_boot.cpp
@@ -61,7 +61,7 @@ static void hideBoot(bool instant)
 	m_btnMgr.hide(m_bootBtnUSBPort, instant);
 }
 
-void CMenu::_Boot(void)
+bool CMenu::_Boot(void)
 {
 	SetupInput();
 	u8 port = currentPort;
@@ -112,13 +112,17 @@ void CMenu::_Boot(void)
 	u8 cur_ios = min(m_cfg.getInt("GENERAL", "force_cios_rev", 0), 254);
 	if(prev_load != cur_load || prev_ios != cur_ios)
 		InternalSave.SaveIOS(cur_ios, cur_load);
-
 	if(port != currentPort)
-	{
 		InternalSave.SavePort(port);
-		m_reload = true;
-	}
 	hideBoot(false);
+
+	if(prev_load != cur_load || prev_ios != cur_ios || port != currentPort)
+	{
+		m_exit = true;
+		m_reload = true;
+		return 1;
+	}
+	return 0;
 }
 
 void CMenu::_refreshBoot(u8 port)
diff --git a/source/menu/menu_config_adv.cpp b/source/menu/menu_config_adv.cpp
index 75feb228..66be191d 100644
--- a/source/menu/menu_config_adv.cpp
+++ b/source/menu/menu_config_adv.cpp
@@ -117,7 +117,8 @@ int CMenu::_configAdv(void)
 			if(m_btnMgr.selected(m_configAdvBtnBootChange))
 			{
 				_hideConfigAdv();
-				_Boot();
+				if(_Boot())
+					break; /* Settings changed */
 				_showConfigAdv();
 			}
 			else if (m_btnMgr.selected(m_configAdvBtnCurThemeP) || m_btnMgr.selected(m_configAdvBtnCurThemeM))