mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

Fix possible crash on startup & disable newly added ActionSets by default

Browse source
This commit is contained in:
fgenesis 2016-07-15 03:28:36 +02:00
parent 2fd181913e
commit 520239a845
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Aquaria/UserSettings.cpp
View file

@ -477,11 +477,12 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
for(XMLElement *xml_action = xml_actionSet->FirstChildElement(); xml_action; xml_action = xml_action->NextSiblingElement()) for(XMLElement *xml_action = xml_actionSet->FirstChildElement(); xml_action; xml_action = xml_action->NextSiblingElement())
{ {
std::string name = xml_action->Attribute("name"); const char *name = xml_action->Attribute("name");
if (!name.empty()) const char *input = xml_action->Attribute("input");
if (name && *name && input && *input)
{ {
ActionInput *ai = as.addActionInput(name); ActionInput *ai = as.addActionInput(name);
ai->fromString(xml_action->Attribute("input")); ai->fromString(input);
} }
} }
} }
@ -490,7 +491,12 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
if(nas < control.minActionSets) if(nas < control.minActionSets)
control.actionSets.resize(control.minActionSets); control.actionSets.resize(control.minActionSets);
while(nas < control.actionSets.size()) while(nas < control.actionSets.size())
ensureDefaultActions(control.actionSets[nas++]); {
ActionSet& as = control.actionSets[nas];
ensureDefaultActions(as);
as.enabled = false;
++nas;
}
} }
XMLElement *xml_demo = doc.FirstChildElement("Demo"); XMLElement *xml_demo = doc.FirstChildElement("Demo");