Skip to content

Commit b79c4d3

Browse files
mhugentmach0
authored andcommitted
Set prompt as default behaviour for unknown CRS
1 parent 712fd61 commit b79c4d3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
321321
{
322322
static QString authid = QString::null;
323323
QSettings mySettings;
324-
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
324+
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
325325
if ( myDefaultProjectionOption == "prompt" )
326326
{
327327
//@note this class is not a descendent of QWidget so we cant pass

src/app/qgsoptions.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
176176
// set the display update threshold
177177
spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
178178
//set the default projection behaviour radio buttongs
179-
if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )
179+
if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )
180180
{
181181
radPromptForProjection->setChecked( true );
182182
}
183-
else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )
183+
else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )
184184
{
185185
radUseProjectProjection->setChecked( true );
186186
}

src/plugins/georeferencer/qgsopenrasterdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void QgsOpenRasterDialog::on_tbnSelectRaster_clicked()
9494

9595
// What DOING this code?
9696
QgsProject* prj = QgsProject::instance();
97-
QString projBehaviour = settings.value( "/Projections/defaultBehaviour" ).toString();
97+
QString projBehaviour = settings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
9898
QString projectCRS = prj->readEntry( "SpatialRefSys", "/ProjectCRSProj4String" );
9999
int projectCrsId = prj->readNumEntry( "SpatialRefSys", "/ProjectCrsId" );
100100

0 commit comments

Comments
 (0)