Do not try to dereference m_viewStep if it's invalid

12 years ago · df89a391c4
parent 738427130b
commit df89a391c4
1 changed files with 6 additions and 8 deletions
--- 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() );
-        m_viewStep->setConfigurationMap( m_configurationMap );
-        if ( m_viewStep )
-        {
-            ViewManager::instance()->addViewStep( m_viewStep );
-            m_loaded = true;
-        }
-        else
+        if ( !m_viewStep )
        {
-            cDebug() << Q_FUNC_INFO << m_loader->errorString();
+            cLog() << Q_FUNC_INFO << m_loader->errorString();
+            return;
        }
+        m_viewStep->setConfigurationMap( m_configurationMap );
+        ViewManager::instance()->addViewStep( m_viewStep );
+        m_loaded = true;
    }
 }