editor widgets: restore initialization of null numeric values and dat…

…es in text edit widget (followup e605ad6; fixes #10326)
qgis · Jun 9, 2014 · dc44747 · dc44747
1 parent 7b9fc8f
commit dc44747
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/gui/editorwidgets/qgstexteditwidget.cpp b/src/gui/editorwidgets/qgstexteditwidget.cpp
@@ -107,9 +107,10 @@ void QgsTextEditWidget::initWidget( QWidget* editor )
 void QgsTextEditWidget::setValue( const QVariant& value )
 {
   QString v;
-  if ( value.isNull() && !( field().type() == QVariant::Int || field().type() == QVariant::Double || field().type() == QVariant::LongLong || field().type() == QVariant::Date ) )
+  if ( value.isNull() )
   {
-    v = QSettings().value( "qgis/nullValue", "NULL" ).toString();
+    if ( !( field().type() == QVariant::Int || field().type() == QVariant::Double || field().type() == QVariant::LongLong || field().type() == QVariant::Date ) )
+      v = QSettings().value( "qgis/nullValue", "NULL" ).toString();
   }
   else
     v = value.toString();