Fix crash with measure tool. Funded by Sourcepole QGIS Enterprise

mhugent · mhugent · commit cac62018fa71 · 2015-10-20T11:22:43.000+02:00
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
@@ -135,8 +135,11 @@ void QgsMeasureDialog::mouseMove( QgsPoint &point )
 
     // Set moving
     QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
-    item->setText( 0, QLocale::system().toString( d, 'f', mDecimalPlaces ) );
-    QgsDebugMsg( QString( "Final result is %1" ).arg( item->text( 0 ) ) );
+    if ( item )
+    {
+      item->setText( 0, QLocale::system().toString( d, 'f', mDecimalPlaces ) );
+      QgsDebugMsg( QString( "Final result is %1" ).arg( item->text( 0 ) ) );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,11 @@ void QgsMeasureDialog::mouseMove( QgsPoint &point )`
`135`	`135`
`136`	`136`	`// Set moving`
`137`	`137`	`QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );`
`138`		`- item->setText( 0, QLocale::system().toString( d, 'f', mDecimalPlaces ) );`
`139`		`- QgsDebugMsg( QString( "Final result is %1" ).arg( item->text( 0 ) ) );`
	`138`	`+ if ( item )`
	`139`	`+ {`
	`140`	`+ item->setText( 0, QLocale::system().toString( d, 'f', mDecimalPlaces ) );`
	`141`	`+ QgsDebugMsg( QString( "Final result is %1" ).arg( item->text( 0 ) ) );`
	`142`	`+ }`
`140`	`143`	`}`
`141`	`144`	`}`
`142`	`145`