mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Fixed an issue with aegisub not trying to open the local config.dat in Windows builds, fixes #902

Browse source 
* Fixed an issue with aegisub failing to start if a local config.dat existed but aegisub did not have permission to write to it

Originally committed to SVN as r3090.
This commit is contained in:
harukalover 2009-06-30 05:55:03 +00:00
parent 2e86a73205
commit b3a69668bf
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/main.cpp
View file

@ -146,15 +146,19 @@ bool AegisubApp::OnInit() {
// Set config file // Set config file
StartupLog(_T("Load configuration")); StartupLog(_T("Load configuration"));
Options.LoadDefaults(); Options.LoadDefaults();
#ifndef __WXMSW__ #ifdef __WXMSW__
Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat"))); // TODO: Display a messagebox about permission being needed to write to local config once the string freeze is over with
if (wxFileName::IsFileWritable(StandardPaths::DecodePath(_T("?data/config.dat"))))
Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat")));
else
Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat")));
Options.Load(); Options.Load();
if (!Options.AsBool(_T("Local config"))) if (!Options.AsBool(_T("Local config")) && Options.GetFile() != StandardPaths::DecodePath(_T("?user/config.dat")))
#endif #endif
{ {
Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat"))); Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat")));
Options.Load(); Options.Load();
#ifndef __WXMSW__ #ifdef __WXMSW__
wxRemoveFile(StandardPaths::DecodePath(_T("?data/config.dat"))); wxRemoveFile(StandardPaths::DecodePath(_T("?data/config.dat")));
#endif #endif
} }

8
aegisub/src/options.cpp
View file

@ -419,6 +419,14 @@ void OptionsManager::SetFile(wxString file) {
} }
////////////////
// Get filename
wxString OptionsManager::GetFile() const
{
return filename;
}
//////// ////////
// Save // Save
void OptionsManager::Save() { void OptionsManager::Save() {

1
aegisub/src/options.h
View file

@ -79,6 +79,7 @@ public:
void Clear(); void Clear();
void SetFile(wxString file); void SetFile(wxString file);
wxString GetFile() const;
void Save(); void Save();
void Load(); void Load();
void LoadDefaults(bool onlyDefaults=false,bool versionOverride=false); void LoadDefaults(bool onlyDefaults=false,bool versionOverride=false);