Merged cleanups and content changes from the trunk. Also fixed compiling with

OpenGL enabled.

1 files changed, 27 insertions, 29 deletions

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 9c3ff008..8bb0b8ca 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -57,18 +57,18 @@ void Configuration::init(const std::string &filename)
 
     for (node = node->xmlChildrenNode; node != NULL; node = node->next)
     {
-        if (xmlStrEqual(node->name, BAD_CAST "option"))
-        {
-            xmlChar *name = xmlGetProp(node, BAD_CAST "name");
-            xmlChar *value = xmlGetProp(node, BAD_CAST "value");
+        if (!xmlStrEqual(node->name, BAD_CAST "option"))
+            continue;
 
-            if (name && value) {
-                mOptions[(const char*)name] = (const char*)value;
-            }
+        xmlChar *name = xmlGetProp(node, BAD_CAST "name");
+        xmlChar *value = xmlGetProp(node, BAD_CAST "value");
 
-            if (name) xmlFree(name);
-            if (value) xmlFree(value);
+        if (name && value) {
+            mOptions[(const char*)name] = (const char*)value;
         }
+
+        if (name) xmlFree(name);
+        if (value) xmlFree(value);
     }
 
     xmlFreeDoc(doc);
@@ -89,31 +89,29 @@ void Configuration::write()
 
     xmlTextWriterPtr writer = xmlNewTextWriterFilename(mConfigPath.c_str(), 0);
 
-    if (writer)
-    {
-        logger->log("Configuration::write() writing configuration...");
+    if (!writer) {
+        logger->log("Configuration::write() error while creating writer");
+        return;
+    }
 
-        xmlTextWriterSetIndent(writer, 1);
-        xmlTextWriterStartDocument(writer, NULL, NULL, NULL);
-        xmlTextWriterStartElement(writer, BAD_CAST "configuration");
+    logger->log("Configuration::write() writing configuration...");
 
-        for (OptionIterator i = mOptions.begin(); i != mOptions.end(); i++)
-        {
-            xmlTextWriterStartElement(writer, BAD_CAST "option");
-            xmlTextWriterWriteAttribute(writer,
-                    BAD_CAST "name", BAD_CAST i->first.c_str());
-            xmlTextWriterWriteAttribute(writer,
-                    BAD_CAST "value", BAD_CAST i->second.c_str());
-            xmlTextWriterEndElement(writer);
-        }
+    xmlTextWriterSetIndent(writer, 1);
+    xmlTextWriterStartDocument(writer, NULL, NULL, NULL);
+    xmlTextWriterStartElement(writer, BAD_CAST "configuration");
 
-        xmlTextWriterEndDocument(writer);
-        xmlFreeTextWriter(writer);
-    }
-    else
+    for (OptionIterator i = mOptions.begin(); i != mOptions.end(); i++)
     {
-        logger->log("Configuration::write() error while creating writer");
+        xmlTextWriterStartElement(writer, BAD_CAST "option");
+        xmlTextWriterWriteAttribute(writer,
+                BAD_CAST "name", BAD_CAST i->first.c_str());
+        xmlTextWriterWriteAttribute(writer,
+                BAD_CAST "value", BAD_CAST i->second.c_str());
+        xmlTextWriterEndElement(writer);
     }
+
+    xmlTextWriterEndDocument(writer);
+    xmlFreeTextWriter(writer);
 }
 
 void Configuration::setValue(const std::string &key, std::string value)