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: