From df89a391c472f24618ed5c1bbc319e95e9fbfbdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Sat, 9 Aug 2014 09:10:26 +0200
Subject: [PATCH] Do not try to dereference m_viewStep if it's invalid

---
 src/libcalamaresui/modulesystem/ViewModule.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/libcalamaresui/modulesystem/ViewModule.cpp b/src/libcalamaresui/modulesystem/ViewModule.cpp
index 2c8c073f9..f81afe659 100644
--- a/src/libcalamaresui/modulesystem/ViewModule.cpp
+++ b/src/libcalamaresui/modulesystem/ViewModule.cpp
@@ -51,16 +51,14 @@ ViewModule::loadSelf()
     if ( m_loader )
     {
         m_viewStep = qobject_cast< ViewStep* >( m_loader->instance() );
+        if ( !m_viewStep )
+        {
+            cLog() << Q_FUNC_INFO << m_loader->errorString();
+            return;
+        }
         m_viewStep->setConfigurationMap( m_configurationMap );
-        if ( m_viewStep )
-        {
-            ViewManager::instance()->addViewStep( m_viewStep );
-            m_loaded = true;
-        }
-        else
-        {
-            cDebug() << Q_FUNC_INFO << m_loader->errorString();
-        }
+        ViewManager::instance()->addViewStep( m_viewStep );
+        m_loaded = true;
     }
 }