Make sure not to crash if there are no alternatives for right click

wonder-sk · wonder-sk · commit 3d99fd5a04c9 · 2019-02-21T08:53:12.000+01:00
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -968,11 +968,14 @@ void QgsVertexTool::tryToSelectFeature( QgsMapMouseEvent *e )
     }
   }
 
-  // move to the next alternative
-  if ( mSelectedFeatureAlternatives->index < mSelectedFeatureAlternatives->alternatives.count() - 1 )
-    ++mSelectedFeatureAlternatives->index;
-  else
-    mSelectedFeatureAlternatives->index = -1;
+  if ( mSelectedFeatureAlternatives )
+  {
+    // move to the next alternative
+    if ( mSelectedFeatureAlternatives->index < mSelectedFeatureAlternatives->alternatives.count() - 1 )
+      ++mSelectedFeatureAlternatives->index;
+    else
+      mSelectedFeatureAlternatives->index = -1;
+  }
 
   if ( mSelectedFeatureAlternatives && mSelectedFeatureAlternatives->index != -1 )
   {

Original file line number	Diff line number	Diff line change
`@@ -968,11 +968,14 @@ void QgsVertexTool::tryToSelectFeature( QgsMapMouseEvent *e )`
`968`	`968`	`}`
`969`	`969`	`}`
`970`	`970`
`971`		`- // move to the next alternative`
`972`		`- if ( mSelectedFeatureAlternatives->index < mSelectedFeatureAlternatives->alternatives.count() - 1 )`
`973`		`- ++mSelectedFeatureAlternatives->index;`
`974`		`- else`
`975`		`- mSelectedFeatureAlternatives->index = -1;`
	`971`	`+ if ( mSelectedFeatureAlternatives )`
	`972`	`+ {`
	`973`	`+ // move to the next alternative`
	`974`	`+ if ( mSelectedFeatureAlternatives->index < mSelectedFeatureAlternatives->alternatives.count() - 1 )`
	`975`	`+ ++mSelectedFeatureAlternatives->index;`
	`976`	`+ else`
	`977`	`+ mSelectedFeatureAlternatives->index = -1;`
	`978`	`+ }`
`976`	`979`
`977`	`980`	`if ( mSelectedFeatureAlternatives && mSelectedFeatureAlternatives->index != -1 )`
`978`	`981`	`{`