Fix setting symbol width/size/rotation from right click menu

nyalldawson · nyalldawson · commit ce2f87ac9369 · 2015-07-04T11:25:33.000+10:00
(fix #13070) (cherry-picked from 4bff1e0)
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -130,7 +130,7 @@ void QgsRendererV2Widget::changeSymbolWidth()
 
   QgsDataDefinedWidthDialog dlg( symbolList, mLayer );
 
-  if ( QMessageBox::Ok == dlg.exec() )
+  if ( QDialog::Accepted == dlg.exec() )
   {
     if ( !dlg.mDDBtn->isActive() )
     {
@@ -155,7 +155,7 @@ void QgsRendererV2Widget::changeSymbolSize()
 
   QgsDataDefinedSizeDialog dlg( symbolList, mLayer );
 
-  if ( QMessageBox::Ok == dlg.exec() )
+  if ( QDialog::Accepted == dlg.exec() )
   {
     if ( !dlg.mDDBtn->isActive() )
     {
@@ -180,7 +180,7 @@ void QgsRendererV2Widget::changeSymbolAngle()
 
   QgsDataDefinedRotationDialog dlg( symbolList, mLayer );
 
-  if ( QMessageBox::Ok == dlg.exec() )
+  if ( QDialog::Accepted == dlg.exec() )
   {
     if ( !dlg.mDDBtn->isActive() )
     {

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ void QgsRendererV2Widget::changeSymbolWidth()`
`130`	`130`
`131`	`131`	`QgsDataDefinedWidthDialog dlg( symbolList, mLayer );`
`132`	`132`
`133`		`- if ( QMessageBox::Ok == dlg.exec() )`
	`133`	`+ if ( QDialog::Accepted == dlg.exec() )`
`134`	`134`	`{`
`135`	`135`	`if ( !dlg.mDDBtn->isActive() )`
`136`	`136`	`{`
`@@ -155,7 +155,7 @@ void QgsRendererV2Widget::changeSymbolSize()`
`155`	`155`
`156`	`156`	`QgsDataDefinedSizeDialog dlg( symbolList, mLayer );`
`157`	`157`
`158`		`- if ( QMessageBox::Ok == dlg.exec() )`
	`158`	`+ if ( QDialog::Accepted == dlg.exec() )`
`159`	`159`	`{`
`160`	`160`	`if ( !dlg.mDDBtn->isActive() )`
`161`	`161`	`{`
`@@ -180,7 +180,7 @@ void QgsRendererV2Widget::changeSymbolAngle()`
`180`	`180`
`181`	`181`	`QgsDataDefinedRotationDialog dlg( symbolList, mLayer );`
`182`	`182`
`183`		`- if ( QMessageBox::Ok == dlg.exec() )`
	`183`	`+ if ( QDialog::Accepted == dlg.exec() )`
`184`	`184`	`{`
`185`	`185`	`if ( !dlg.mDDBtn->isActive() )`
`186`	`186`	`{`