From 1e23cda2ffc812a20aac9dbca9de02658495b4c0 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 18 Jul 2014 12:56:10 +0100
Subject: [PATCH] Cleaned up a couple of minor analyser warnings.

---
 .../ComponentEditor/jucer_PaintRoutine.cpp       | 16 +++++++---------
 .../Source/Utility/jucer_StoredSettings.cpp      |  4 ++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp b/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp
index 73621112cb..123f7db550 100644
--- a/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp
+++ b/extras/Introjucer/Source/ComponentEditor/jucer_PaintRoutine.cpp
@@ -134,15 +134,13 @@ PaintElement* PaintRoutine::addElementFromXml (const XmlElement& xml, const int
 
         return elements [action->indexAdded];
     }
-    else
+
+    if (PaintElement* const newElement = ObjectTypes::createElementForXml (&xml, this))
     {
-        if (PaintElement* const newElement = ObjectTypes::createElementForXml (&xml, this))
-        {
-            elements.insert (index, newElement);
-            changed();
+        elements.insert (index, newElement);
+        changed();
 
-            return newElement;
-        }
+        return newElement;
     }
 
     return nullptr;
@@ -390,10 +388,10 @@ void PaintRoutine::groupSelected()
 
 void PaintRoutine::ungroupSelected()
 {
-    const SelectedItemSet <PaintElement*> temp (selectedElements);
+    const SelectedItemSet<PaintElement*> temp (selectedElements);
 
     for (int i = 0; i < temp.getNumSelected(); ++i)
-        if (PaintElementGroup* const pg = dynamic_cast <PaintElementGroup*> (temp.getSelectedItem (i)))
+        if (PaintElementGroup* const pg = dynamic_cast<PaintElementGroup*> (temp.getSelectedItem (i)))
             pg->ungroup (true);
 }
 
diff --git a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
index e95cb27062..7466066921 100644
--- a/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_StoredSettings.cpp
@@ -117,8 +117,12 @@ void StoredSettings::reload()
     recentFiles.removeNonExistentFiles();
 
     ScopedPointer<XmlElement> xml (getGlobalProperties().getXmlValue ("editorColours"));
+
     if (xml == nullptr)
+    {
         xml = XmlDocument::parse (BinaryData::colourscheme_dark_xml);
+        jassert (xml != nullptr);
+    }
 
     appearance.readFromXML (*xml);