sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33391 from elpaso/bugfix-gh33390-html-form-wodget-crash

Browse Source 
Don't crash on QgsHtmlWidgetWrapper
This commit is contained in:
Alessandro Pasotti 2019-12-13 22:36:01 +01:00 committed by GitHub
commit 33b1bec927
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/qgsattributeform.cpp
View File

@ -244,20 +244,23 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va
for ( QgsWidgetWrapper *ww : constMWidgets )
{
QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( ww );
if ( eww && eww->field().name() == field )
if ( eww )
{
eww->setValues( value, QVariantList() );
eww->setHint( hintText );
}
// see if the field is present in additional fields of the editor widget
int index = eww->additionalFields().indexOf( field );
if ( index >= 0 )
{
QVariant mainValue = eww->value();
QVariantList additionalFieldValues = eww->additionalFieldValues();
additionalFieldValues[index] = value;
eww->setValues( mainValue, additionalFieldValues );
eww->setHint( hintText );
if ( eww->field().name() == field )
{
eww->setValues( value, QVariantList() );
eww->setHint( hintText );
}
// see if the field is present in additional fields of the editor widget
int index = eww->additionalFields().indexOf( field );
if ( index >= 0 )
{
QVariant mainValue = eww->value();
QVariantList additionalFieldValues = eww->additionalFieldValues();
additionalFieldValues[index] = value;
eww->setValues( mainValue, additionalFieldValues );
eww->setHint( hintText );
}
}
}
}