When settings are not found/corrupted, construct a valid blank XML do…

…cument
malensek · May 20, 2015 · 95fc458 · 95fc458
1 parent be836f1
commit 95fc458
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/3RVX/Settings.cpp b/3RVX/Settings.cpp
@@ -68,16 +68,25 @@ void Settings::Load() {
     std::string u8FileName = StringUtils::Narrow(_file);
     tinyxml2::XMLError result = _xml.LoadFile(u8FileName.c_str());
     if (result != tinyxml2::XMLError::XML_SUCCESS) {
-        _xml.Clear();
         Error::ErrorMessage(GENERR_SETTINGSFILE, _file);
+        LoadEmptySettings();
         return;
     }
 
     _root = _xml.GetDocument()->FirstChildElement("settings");
     if (_root == NULL) {
         Error::ErrorMessage(GENERR_MISSING_XML, L"<settings>");
+        LoadEmptySettings();
         return;
     }
+
+}
+
+void Settings::LoadEmptySettings() {
+    _xml.Clear();
+    _xml.InsertFirstChild(_xml.NewDeclaration());
+    _root = _xml.NewElement("settings");
+    _xml.GetDocument()->InsertEndChild(_root);
 }
 
 int Settings::Save() {

diff --git a/3RVX/Settings.h b/3RVX/Settings.h
@@ -30,6 +30,7 @@ class Settings {
     static Settings *Instance();
 
     void Load();
+    void LoadEmptySettings();
     int Save();
 
     static std::wstring AppDir();