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

Changed how portable install handles "Clear all settings" so it doesn't remove the portable.ini anymore. 

Instead it resets the flag for running the first time wizard.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4356 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2011-02-24 21:50:17 +00:00
parent 0744d4e309
commit 253cd9becf
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcsx2/gui/AppUserMode.cpp
View File

@ -200,23 +200,21 @@ void Pcsx2App::WipeUserModeSettings()
{ {
if (InstallationMode == InstallMode_Portable) if (InstallationMode == InstallMode_Portable)
{ {
// Remove the user local portable ini definition (if possible). // Reset RunWizard so the FTWizard is run again on next PCSX2 start.
// If the user does not have admin rights to the PCSX2 folder, removing the file may fail. // 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, // 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 // so there should (in theory) be no sane way for this to error if we're running
// in portable mode. // in portable mode.
wxFileName portableIniFile( GetPortableIniPath() ); wxFileName portableIniFile( GetPortableIniPath() );
if (portableIniFile.FileExists()) ScopedPtr<wxFileConfig> conf_portable( OpenFileConfig( portableIniFile.GetFullPath() ) );
wxRemoveFile(portableIniFile.GetFullPath()); conf_portable->Write( L"RunWizard", true );
}
else
{
// Remove the app-local / registry entry conforming to this instance of PCSX2.
ScopedPtr<wxConfigBase> conf_install( OpenInstallSettingsFile() );
conf_install->DeleteEntry(L"RunWizard");
} }
// Remove the app-local / registry entry conforming to this instance of PCSX2.
// Remove this regardless if PCSX2 is in portable mode, since otherwise these settings
// would be used when the user restarts PCSX2, and that might be undesirable.
ScopedPtr<wxConfigBase> conf_install( OpenInstallSettingsFile() );
conf_install->DeleteEntry(L"RunWizard");
} }
static void DoFirstTimeWizard() static void DoFirstTimeWizard()