Restore OverrideCursor in field calculator on fail

m-kuhn · m-kuhn · commit b8ea6e88f4e1 · 2014-05-15T14:46:04.000+02:00
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -143,6 +143,7 @@ void QgsFieldCalculator::accept()
 
     if ( !mVectorLayer->addAttribute( newField ) )
     {
+      QApplication::restoreOverrideCursor();
       QMessageBox::critical( 0, tr( "Provider error" ), tr( "Could not add the new field to the provider." ) );
       mVectorLayer->destroyEditCommand();
       return;
@@ -162,6 +163,7 @@ void QgsFieldCalculator::accept()
 
     if ( ! exp.prepare( mVectorLayer->pendingFields() ) )
     {
+      QApplication::restoreOverrideCursor();
       QMessageBox::critical( 0, tr( "Evaluation error" ), exp.evalErrorString() );
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ void QgsFieldCalculator::accept()`
`143`	`143`
`144`	`144`	`if ( !mVectorLayer->addAttribute( newField ) )`
`145`	`145`	`{`
	`146`	`+ QApplication::restoreOverrideCursor();`
`146`	`147`	`QMessageBox::critical( 0, tr( "Provider error" ), tr( "Could not add the new field to the provider." ) );`
`147`	`148`	`mVectorLayer->destroyEditCommand();`
`148`	`149`	`return;`
`@@ -162,6 +163,7 @@ void QgsFieldCalculator::accept()`
`162`	`163`
`163`	`164`	`if ( ! exp.prepare( mVectorLayer->pendingFields() ) )`
`164`	`165`	`{`
	`166`	`+ QApplication::restoreOverrideCursor();`
`165`	`167`	`QMessageBox::critical( 0, tr( "Evaluation error" ), exp.evalErrorString() );`
`166`	`168`	`return;`
`167`	`169`	`}`