fix crash in spatialite srid selection on creation

jef · jef · commit ac96dcce1ada · 2010-04-26T11:35:56.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13392 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp
@@ -181,7 +181,6 @@ void QgsNewSpatialiteLayerDialog::on_pbnFindSRID_clicked()
     if ( sridDlg->exec() )
     {
       // set the srid field to the selection
-      sridDlg->selectedSrid();
       leSRID->setText( sridDlg->selectedSrid() );
       sridDlg->accept();
     }
diff --git a/src/app/qgsspatialitesridsdialog.cpp b/src/app/qgsspatialitesridsdialog.cpp
@@ -33,7 +33,10 @@ QgsSpatialiteSridsDialog::~QgsSpatialiteSridsDialog()
 }
 QString QgsSpatialiteSridsDialog::selectedSrid()
 {
-  return twSrids->currentItem()->text( 0 );
+  if ( twSrids->currentItem() )
+    return twSrids->currentItem()->text( 0 );
+  else
+    return "-1";
 }
 bool QgsSpatialiteSridsDialog::load( QString dbName )
 {

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ void QgsNewSpatialiteLayerDialog::on_pbnFindSRID_clicked()`
`181`	`181`	`if ( sridDlg->exec() )`
`182`	`182`	`{`
`183`	`183`	`// set the srid field to the selection`
`184`		`- sridDlg->selectedSrid();`
`185`	`184`	`leSRID->setText( sridDlg->selectedSrid() );`
`186`	`185`	`sridDlg->accept();`
`187`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,10 @@ QgsSpatialiteSridsDialog::~QgsSpatialiteSridsDialog()`
`33`	`33`	`}`
`34`	`34`	`QString QgsSpatialiteSridsDialog::selectedSrid()`
`35`	`35`	`{`
`36`		`- return twSrids->currentItem()->text( 0 );`
	`36`	`+ if ( twSrids->currentItem() )`
	`37`	`+ return twSrids->currentItem()->text( 0 );`
	`38`	`+ else`
	`39`	`+ return "-1";`
`37`	`40`	`}`
`38`	`41`	`bool QgsSpatialiteSridsDialog::load( QString dbName )`
`39`	`42`	`{`