Fix crash when holding tab key in some circumstances

nyalldawson · nyalldawson · commit 8e7e751ba3d2 · 2021-08-17T12:19:47.000+10:00
Fixes #44669
diff --git a/src/gui/locator/qgslocatorwidget.cpp b/src/gui/locator/qgslocatorwidget.cpp
@@ -401,16 +401,24 @@ void QgsLocatorResultsView::recalculateSize()
 
 void QgsLocatorResultsView::selectNextResult()
 {
+  const int rowCount = model()->rowCount( QModelIndex() );
+  if ( rowCount == 0 )
+    return;
+
   int nextRow = currentIndex().row() + 1;
-  nextRow = nextRow % model()->rowCount( QModelIndex() );
+  nextRow = nextRow % rowCount;
   setCurrentIndex( model()->index( nextRow, 0 ) );
 }
 
 void QgsLocatorResultsView::selectPreviousResult()
 {
+  const int rowCount = model()->rowCount( QModelIndex() );
+  if ( rowCount == 0 )
+    return;
+
   int previousRow = currentIndex().row() - 1;
   if ( previousRow < 0 )
-    previousRow = model()->rowCount( QModelIndex() ) - 1;
+    previousRow = rowCount - 1;
   setCurrentIndex( model()->index( previousRow, 0 ) );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -401,16 +401,24 @@ void QgsLocatorResultsView::recalculateSize()`
`401`	`401`
`402`	`402`	`void QgsLocatorResultsView::selectNextResult()`
`403`	`403`	`{`
	`404`	`+ const int rowCount = model()->rowCount( QModelIndex() );`
	`405`	`+ if ( rowCount == 0 )`
	`406`	`+ return;`
	`407`	`+`
`404`	`408`	`int nextRow = currentIndex().row() + 1;`
`405`		`- nextRow = nextRow % model()->rowCount( QModelIndex() );`
	`409`	`+ nextRow = nextRow % rowCount;`
`406`	`410`	`setCurrentIndex( model()->index( nextRow, 0 ) );`
`407`	`411`	`}`
`408`	`412`
`409`	`413`	`void QgsLocatorResultsView::selectPreviousResult()`
`410`	`414`	`{`
	`415`	`+ const int rowCount = model()->rowCount( QModelIndex() );`
	`416`	`+ if ( rowCount == 0 )`
	`417`	`+ return;`
	`418`	`+`
`411`	`419`	`int previousRow = currentIndex().row() - 1;`
`412`	`420`	`if ( previousRow < 0 )`
`413`		`- previousRow = model()->rowCount( QModelIndex() ) - 1;`
	`421`	`+ previousRow = rowCount - 1;`
`414`	`422`	`setCurrentIndex( model()->index( previousRow, 0 ) );`
`415`	`423`	`}`
`416`	`424`