ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistency update for r4356: 

Clear all settings now deletes the RunWizard entry in both install modes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4361 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-02-25 19:51:11 +00:00
parent 3020a37f2c
commit d1371e85f6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/gui/AppUserMode.cpp
View File

@ -195,23 +195,19 @@ wxConfigBase* Pcsx2App::TestForPortableInstall()
return NULL; return NULL;
} }
// Removes both portable ini and user local ini entry conforming to this instance of PCSX2. // Reset RunWizard so the FTWizard is run again on next PCSX2 start.
void Pcsx2App::WipeUserModeSettings() void Pcsx2App::WipeUserModeSettings()
{ {
if (InstallationMode == InstallMode_Portable) if (InstallationMode == InstallMode_Portable)
{ {
// Reset RunWizard so the FTWizard is run again on next PCSX2 start. // Remove the portable.ini entry "RunWizard" conforming to this instance of PCSX2.
// If the user does not have admin rights to the PCSX2 folder, writing to the file may fail.
// PCSX2 does checks for admin rights on start-up if the file is found, though,
// so there should (in theory) be no sane way for this to error if we're running
// in portable mode.
wxFileName portableIniFile( GetPortableIniPath() ); wxFileName portableIniFile( GetPortableIniPath() );
ScopedPtr<wxFileConfig> conf_portable( OpenFileConfig( portableIniFile.GetFullPath() ) ); ScopedPtr<wxFileConfig> conf_portable( OpenFileConfig( portableIniFile.GetFullPath() ) );
conf_portable->Write( L"RunWizard", true ); conf_portable->DeleteEntry(L"RunWizard");
} }
else else
{ {
// Remove the app-local / registry entry conforming to this instance of PCSX2. // Remove the registry entry "RunWizard" conforming to this instance of PCSX2.
ScopedPtr<wxConfigBase> conf_install( OpenInstallSettingsFile() ); ScopedPtr<wxConfigBase> conf_install( OpenInstallSettingsFile() );
conf_install->DeleteEntry(L"RunWizard"); conf_install->DeleteEntry(L"RunWizard");
} }