mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-25 15:33:57 +00:00
Code Issues Releases Wiki Activity

fix crash when usersettings fail to load

Browse source
This commit is contained in:
fgenesis 2022-06-20 04:24:01 +02:00
parent 60dd1d7bc7
commit af6c6a31aa
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Aquaria/UserSettings.cpp
View file

@ -315,43 +315,40 @@ static void readInt(XMLElement *xml, const char *elem, const char *att, int *toC
}
}
void UserSettings::loadDefaults(bool doApply)
bool UserSettings::loadDefaults(bool doApply)
{
std::ostringstream os;
os << "default-" << VERSION_USERSETTINGS << ".xml";
if (exists(os.str()))
std::string fn = "default_usersettings.xml";
if (exists(fn))
{
load(doApply, os.str());
return;
return load(doApply, fn);
}
if (exists("default_usersettings.xml"))
{
load(doApply, "default_usersettings.xml");
return;
return false;
}
errorLog("No default user settings file found! Controls may be broken.");
}
void UserSettings::load(bool doApply, const std::string &overrideFile)
bool UserSettings::load(bool doApply, const std::string &overrideFile)
{
std::string filename;
#if defined(BBGE_BUILD_UNIX)
filename = dsq->getPreferencesFolder() + "/" + userSettingsFilename;
#elif defined(BBGE_BUILD_WINDOWS)
if (!overrideFile.empty())
filename = overrideFile;
else
{
#if defined(BBGE_BUILD_UNIX)
filename = dsq->getPreferencesFolder() + "/" + userSettingsFilename;
#else
filename = userSettingsFilename;
#endif
}
if(!exists(filename))
return false;
XMLDocument doc;
if(readXML(filename, doc) != XML_SUCCESS)
{
errorLog("UserSettings: Malformed XML, continuing with defaults");
doc.Clear(); // just in case
errorLog("UserSettings [" + filename + "]: Error, malformed XML");
return false;
}
version.settingsVersion = 0;
@ -510,6 +507,9 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
}
}
if(control.actionSets.empty())
control.actionSets.resize(1);
if(control.actionSets.size() == 1)
control.actionSets[0].enabled = true;
@ -570,6 +570,8 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
if (doApply)
apply();
return true;
}
void UserSettings::apply()

4
Aquaria/UserSettings.h
View file

@ -128,8 +128,8 @@ public:
std::string masterServer;
} network;
void loadDefaults(bool doApply=true);
void load(bool doApply=true, const std::string &overrideFile="");
bool loadDefaults(bool doApply=true);
bool load(bool doApply=true, const std::string &overrideFile="");
void save();
void apply();
};