Fix Coverity null-pointer dererence warnings

qgis · Apr 3, 2018 · 7b0cf28 · 7b0cf28
1 parent c2af8ca
commit 7b0cf28
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -834,9 +834,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
 
     QgsColorScheme *scheme = QgsApplication::colorSchemeRegistry()->schemes().value( index );
     if ( scheme )
+    {
       mTreeCustomColors->setScheme( scheme );
-
-    updateActionsForCurrentColorScheme( scheme );
+      updateActionsForCurrentColorScheme( scheme );
+    }
   } );
 
   //
@@ -2336,6 +2337,9 @@ void QgsOptions::refreshSchemeComboBox()
 
 void QgsOptions::updateActionsForCurrentColorScheme( QgsColorScheme *scheme )
 {
+  if ( !scheme )
+    return;
+
   mButtonImportColors->setEnabled( scheme->isEditable() );
   mButtonPasteColors->setEnabled( scheme->isEditable() );
   mButtonAddColor->setEnabled( scheme->isEditable() );