Do not change property widget status if the dialog is rejected

refs #16766
This commit is contained in:
Harrissou Sant-anna 2017-11-25 14:34:21 +01:00 committed by Nyall Dawson
parent 731b57c8a7
commit 4f9e2a5f29

View File

@ -639,16 +639,18 @@ void QgsPropertyOverrideButton::showAssistant()
connect( buttonBox, &QDialogButtonBox::rejected, dlg, &QDialog::reject );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsPropertyOverrideButton::showHelp );
dlg->layout()->addWidget( buttonBox );
dlg->exec();
if ( dlg->exec() == QDialog::Accepted )
{
widget->updateProperty( mProperty );
mExpressionString = mProperty.asExpression();
mFieldName = mProperty.field();
widget->acceptPanel();
updateGui();
emit changed();
}
settings.setValue( key, dlg->saveGeometry() );
widget->updateProperty( mProperty );
mExpressionString = mProperty.asExpression();
mFieldName = mProperty.field();
widget->acceptPanel();
updateGui();
emit changed();
}
}