Drag and drop editor: Don't crash with hidden field (Fix #8380)

qgis · Jul 29, 2013 · 65ac5a7 · 65ac5a7
1 parent 0b92877
commit 65ac5a7
Showing 1 changed file with 25 additions and 22 deletions.
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
@@ -1349,34 +1349,37 @@ QWidget* QgsAttributeEditor::createWidgetFromDef( const QgsAttributeEditorElemen
       int fldIdx = fieldDef->idx();
       newWidget = createAttributeEditor( parent, 0, vl, fldIdx, attrs.value( fldIdx, QVariant() ), proxyWidgets );
 
-      if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable )
+      if ( newWidget )
       {
-        if ( newWidget->isEnabled() && vl->isEditable() && vl->fieldEditable( fldIdx ) )
+        if ( vl->editType( fldIdx ) != QgsVectorLayer::Immutable )
         {
-          newWidget->setEnabled( true );
-        }
-        else if ( vl->editType( fldIdx ) == QgsVectorLayer::Photo )
-        {
-          foreach ( QWidget *w, newWidget->findChildren<QWidget *>() )
+          if ( newWidget->isEnabled() && vl->isEditable() && vl->fieldEditable( fldIdx ) )
           {
-            w->setEnabled( qobject_cast<QLabel *>( w ) ? true : false );
+            newWidget->setEnabled( true );
           }
-        }
-        else if ( vl->editType( fldIdx ) == QgsVectorLayer::WebView )
-        {
-          foreach ( QWidget *w, newWidget->findChildren<QWidget *>() )
+          else if ( vl->editType( fldIdx ) == QgsVectorLayer::Photo )
           {
-            if ( qobject_cast<QWebView *>( w ) )
-              w->setEnabled( true );
-            else if ( qobject_cast<QPushButton *>( w ) && w->objectName() == "openUrl" )
-              w->setEnabled( true );
-            else
-              w->setEnabled( false );
+            foreach ( QWidget *w, newWidget->findChildren<QWidget *>() )
+            {
+              w->setEnabled( qobject_cast<QLabel *>( w ) ? true : false );
+            }
+          }
+          else if ( vl->editType( fldIdx ) == QgsVectorLayer::WebView )
+          {
+            foreach ( QWidget *w, newWidget->findChildren<QWidget *>() )
+            {
+              if ( qobject_cast<QWebView *>( w ) )
+                w->setEnabled( true );
+              else if ( qobject_cast<QPushButton *>( w ) && w->objectName() == "openUrl" )
+                w->setEnabled( true );
+              else
+                w->setEnabled( false );
+            }
+          }
+          else
+          {
+            newWidget->setEnabled( false );
           }
-        }
-        else
-        {
-          newWidget->setEnabled( false );
         }
       }