Fix reading of multi selection ValueRelation widgets

m-kuhn · m-kuhn · commit b448826d5b1b · 2017-11-22T17:50:50.000+01:00
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -149,7 +149,11 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )
 {
   if ( mListWidget )
   {
-    QStringList checkList = value.toString().remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( ',' );
+    QStringList checkList;
+    if ( value.type() == QVariant::StringList )
+      checkList = value.toStringList();
+    else if ( value.type() == QVariant::String )
+      checkList = value.toString().remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( ',' );
 
     for ( int i = 0; i < mListWidget->count(); ++i )
     {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,11 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )`
`149`	`149`	`{`
`150`	`150`	`if ( mListWidget )`
`151`	`151`	`{`
`152`		`- QStringList checkList = value.toString().remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( ',' );`
	`152`	`+ QStringList checkList;`
	`153`	`+ if ( value.type() == QVariant::StringList )`
	`154`	`+ checkList = value.toStringList();`
	`155`	`+ else if ( value.type() == QVariant::String )`
	`156`	`+ checkList = value.toString().remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( ',' );`
`153`	`157`
`154`	`158`	`for ( int i = 0; i < mListWidget->count(); ++i )`
`155`	`159`	`{`