From 50a560856c439d96b84f9d5947355285e29073a5 Mon Sep 17 00:00:00 2001
From: Stephen Knox <stephenknox73@gmail.com>
Date: Fri, 18 Sep 2020 02:17:04 +0100
Subject: [PATCH] Make sure empty array in listwidget is null Fixes #38176

(cherry picked from commit 5c225cce8b890949ff71518ebaade16a124378f2)
---
 src/gui/editorwidgets/qgslistwidgetwrapper.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/gui/editorwidgets/qgslistwidgetwrapper.cpp b/src/gui/editorwidgets/qgslistwidgetwrapper.cpp
index 99309411f48f..b7b66217b2de 100644
--- a/src/gui/editorwidgets/qgslistwidgetwrapper.cpp
+++ b/src/gui/editorwidgets/qgslistwidgetwrapper.cpp
@@ -70,16 +70,25 @@ QVariant QgsListWidgetWrapper::value() const
 {
   QVariant::Type type = field().type();
   if ( !mWidget ) return QVariant( type );
+  const QVariantList list = mWidget->list();
   if ( type == QVariant::StringList )
   {
     QStringList result;
-    const QVariantList list = mWidget->list();
     for ( QVariantList::const_iterator it = list.constBegin(); it != list.constEnd(); ++it )
       result.append( it->toString() );
     return result;
   }
   else
-    return QVariant( mWidget->list() );
+  {
+    if ( list.size() == 0 )
+    {
+      return QVariant( );
+    }
+    else
+    {
+      return list;
+    }
+  }
 }
 
 void QgsListWidgetWrapper::onValueChanged()