Fix a crash when toggling a layer to editable mode

wonder-sk · wonder-sk · commit bdd81685a1a2 · 2017-06-08T15:56:56.000+02:00
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
@@ -469,7 +469,7 @@ bool QgsMapToolLabel::currentLabelDataDefinedPosition( double &x, bool &xSuccess
 
 bool QgsMapToolLabel::layerIsRotatable( QgsVectorLayer *vlayer, int &rotationCol ) const
 {
-  if ( !vlayer || !vlayer->isEditable() )
+  if ( !vlayer || !vlayer->isEditable() || !vlayer->labeling() )
   {
     return false;
   }
@@ -590,7 +590,7 @@ bool QgsMapToolLabel::diagramMoveable( QgsVectorLayer *vlayer, int &xCol, int &y
 
 bool QgsMapToolLabel::labelMoveable( QgsVectorLayer *vlayer, int &xCol, int &yCol ) const
 {
-  if ( !vlayer || !vlayer->isEditable() )
+  if ( !vlayer || !vlayer->isEditable() || !vlayer->labeling() )
   {
     return false;
   }
@@ -623,7 +623,7 @@ bool QgsMapToolLabel::layerCanPin( QgsVectorLayer *vlayer, int &xCol, int &yCol
 
 bool QgsMapToolLabel::labelCanShowHide( QgsVectorLayer *vlayer, int &showCol ) const
 {
-  if ( !vlayer || !vlayer->isEditable() )
+  if ( !vlayer || !vlayer->isEditable() || !vlayer->labeling() )
   {
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ bool QgsMapToolLabel::currentLabelDataDefinedPosition( double &x, bool &xSuccess`
`469`	`469`
`470`	`470`	`bool QgsMapToolLabel::layerIsRotatable( QgsVectorLayer *vlayer, int &rotationCol ) const`
`471`	`471`	`{`
`472`		`- if ( !vlayer \|\| !vlayer->isEditable() )`
	`472`	`+ if ( !vlayer \|\| !vlayer->isEditable() \|\| !vlayer->labeling() )`
`473`	`473`	`{`
`474`	`474`	`return false;`
`475`	`475`	`}`
`@@ -590,7 +590,7 @@ bool QgsMapToolLabel::diagramMoveable( QgsVectorLayer *vlayer, int &xCol, int &y`
`590`	`590`
`591`	`591`	`bool QgsMapToolLabel::labelMoveable( QgsVectorLayer *vlayer, int &xCol, int &yCol ) const`
`592`	`592`	`{`
`593`		`- if ( !vlayer \|\| !vlayer->isEditable() )`
	`593`	`+ if ( !vlayer \|\| !vlayer->isEditable() \|\| !vlayer->labeling() )`
`594`	`594`	`{`
`595`	`595`	`return false;`
`596`	`596`	`}`
`@@ -623,7 +623,7 @@ bool QgsMapToolLabel::layerCanPin( QgsVectorLayer *vlayer, int &xCol, int &yCol`
`623`	`623`
`624`	`624`	`bool QgsMapToolLabel::labelCanShowHide( QgsVectorLayer *vlayer, int &showCol ) const`
`625`	`625`	`{`
`626`		`- if ( !vlayer \|\| !vlayer->isEditable() )`
	`626`	`+ if ( !vlayer \|\| !vlayer->isEditable() \|\| !vlayer->labeling() )`
`627`	`627`	`{`
`628`	`628`	`return false;`
`629`	`629`	`}`