Fix incorrect cursor used for rotate map tool

nyalldawson · 3nids · commit cc18918ba2ff · 2018-01-22T06:57:32.000-09:00
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -398,7 +398,6 @@ void QgsMapToolRotateFeature::applyRotation( double rotation )
 
 void QgsMapToolRotateFeature::activate()
 {
-
   QgsVectorLayer *vlayer = currentVectorLayer();
   if ( !vlayer )
   {
@@ -410,11 +409,7 @@ void QgsMapToolRotateFeature::activate()
     return;
   }
 
-  if ( vlayer->selectedFeatureCount() == 0 )
-  {
-    return;
-  }
-  else
+  if ( vlayer->selectedFeatureCount() > 0 )
   {
     QgsRectangle bound = vlayer->boundingBoxOfSelected();
     mStartPointMapCoords = toMapCoordinates( vlayer, bound.center() );
@@ -424,9 +419,8 @@ void QgsMapToolRotateFeature::activate()
     mAnchorPoint->setCenter( mStartPointMapCoords );
 
     mStPoint = toCanvasCoordinates( mStartPointMapCoords );
-
-    QgsMapTool::activate();
   }
+  QgsMapTool::activate();
 }
 
 void QgsMapToolRotateFeature::deleteRubberband()

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,6 @@ void QgsMapToolRotateFeature::applyRotation( double rotation )`
`398`	`398`
`399`	`399`	`void QgsMapToolRotateFeature::activate()`
`400`	`400`	`{`
`401`		`-`
`402`	`401`	`QgsVectorLayer *vlayer = currentVectorLayer();`
`403`	`402`	`if ( !vlayer )`
`404`	`403`	`{`
`@@ -410,11 +409,7 @@ void QgsMapToolRotateFeature::activate()`
`410`	`409`	`return;`
`411`	`410`	`}`
`412`	`411`
`413`		`- if ( vlayer->selectedFeatureCount() == 0 )`
`414`		`- {`
`415`		`- return;`
`416`		`- }`
`417`		`- else`
	`412`	`+ if ( vlayer->selectedFeatureCount() > 0 )`
`418`	`413`	`{`
`419`	`414`	`QgsRectangle bound = vlayer->boundingBoxOfSelected();`
`420`	`415`	`mStartPointMapCoords = toMapCoordinates( vlayer, bound.center() );`
`@@ -424,9 +419,8 @@ void QgsMapToolRotateFeature::activate()`
`424`	`419`	`mAnchorPoint->setCenter( mStartPointMapCoords );`
`425`	`420`
`426`	`421`	`mStPoint = toCanvasCoordinates( mStartPointMapCoords );`
`427`		`-`
`428`		`- QgsMapTool::activate();`
`429`	`422`	`}`
	`423`	`+ QgsMapTool::activate();`
`430`	`424`	`}`
`431`	`425`
`432`	`426`	`void QgsMapToolRotateFeature::deleteRubberband()`