From 34eb64c3fe6b134e29a7a4e75619cf714a13981e Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 12 Mar 2010 02:27:31 +0000
Subject: [PATCH] More minor bugfixes to startup/init and directory/ini junk.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2699 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/gui/AppInit.cpp        | 2 +-
 pcsx2/gui/MainMenuClicks.cpp | 2 ++
 pcsx2/gui/RecentIsoList.cpp  | 7 +++++++
 pcsx2/gui/RecentIsoList.h    | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index 87974d52a8..7d327ff7fa 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -124,7 +124,7 @@ void Pcsx2App::ReadUserModeSettings()
 	bool hasGroup = conf_usermode->HasGroup( groupname );
 	bool forceWiz = m_ForceWizard || !hasGroup;
 	
-	if( forceWiz )
+	if( !forceWiz )
 	{
 		conf_usermode->SetPath( groupname );
 		forceWiz = !conf_usermode->HasEntry( L"DocumentsFolderMode" );
diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp
index 9b353c5104..c28a6d0d15 100644
--- a/pcsx2/gui/MainMenuClicks.cpp
+++ b/pcsx2/gui/MainMenuClicks.cpp
@@ -69,6 +69,7 @@ static void WipeSettings()
 
 	//wxRmdir( GetSettingsFolder().ToString() );
 	
+	wxGetApp().GetRecentIsoManager().Clear();
 	g_Conf = new AppConfig();
 	sMainFrame.RemoveCdvdMenu();
 }
@@ -252,6 +253,7 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
 		}
 	}
 	
+	sApp.SysReset();
 	sApp.SysReset();
 	sApp.SysExecute( g_Conf->CdvdSource );
 }
diff --git a/pcsx2/gui/RecentIsoList.cpp b/pcsx2/gui/RecentIsoList.cpp
index f7af82ace2..396bf8ffd2 100644
--- a/pcsx2/gui/RecentIsoList.cpp
+++ b/pcsx2/gui/RecentIsoList.cpp
@@ -80,6 +80,13 @@ void RecentIsoManager::RemoveAllFromMenu()
 	}
 }
 
+void RecentIsoManager::Clear()
+{
+	RemoveAllFromMenu();
+	m_Items.clear();
+	Repopulate();
+}
+
 void RecentIsoManager::Repopulate()
 {
 	int cnt = m_Items.size();
diff --git a/pcsx2/gui/RecentIsoList.h b/pcsx2/gui/RecentIsoList.h
index 5fad37f215..c6570859a6 100644
--- a/pcsx2/gui/RecentIsoList.h
+++ b/pcsx2/gui/RecentIsoList.h
@@ -50,6 +50,7 @@ public:
 
 	void RemoveAllFromMenu();
 	void Repopulate();
+	void Clear();
 	void Add( const wxString& src );
 	
 protected: