[raster calc] cancelling the process should cancel the process

nirvn · nirvn · commit 605bb75876af · 2018-02-08T17:08:33.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5331,7 +5331,7 @@ void QgisApp::showRasterCalculator()
     p.setMaximum( 100.0 );
     QgsFeedback feedback;
     connect( &feedback, &QgsFeedback::progressChanged, &p, &QProgressDialog::setValue );
-    connect( &feedback, &QgsFeedback::canceled, &p, &QProgressDialog::cancel );
+    connect( &p, &QProgressDialog::canceled, &feedback, &QgsFeedback::cancel );
     QgsRasterCalculator::Result res = static_cast< QgsRasterCalculator::Result >( rc.processCalculation( &feedback ) );
     switch ( res )
     {

Original file line number	Diff line number	Diff line change
`@@ -5331,7 +5331,7 @@ void QgisApp::showRasterCalculator()`
`5331`	`5331`	`p.setMaximum( 100.0 );`
`5332`	`5332`	`QgsFeedback feedback;`
`5333`	`5333`	`connect( &feedback, &QgsFeedback::progressChanged, &p, &QProgressDialog::setValue );`
`5334`		`- connect( &feedback, &QgsFeedback::canceled, &p, &QProgressDialog::cancel );`
	`5334`	`+ connect( &p, &QProgressDialog::canceled, &feedback, &QgsFeedback::cancel );`
`5335`	`5335`	`QgsRasterCalculator::Result res = static_cast< QgsRasterCalculator::Result >( rc.processCalculation( &feedback ) );`
`5336`	`5336`	`switch ( res )`
`5337`	`5337`	`{`