Skip to content

Commit

Permalink
fix #2753
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13595 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 29, 2010
1 parent a3dbbac commit 82046b5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
{
QString toProj4;
QSettings mySettings;
QString myDefaultProjectionOption =
mySettings.value( "/Projections/defaultBehaviour" ).toString();
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
if ( myDefaultProjectionOption == "prompt" )
{
//@note this class is not a descendent of QWidget so we cant pass
Expand All @@ -327,15 +326,16 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
mySelector->setSelectedCrsId( defaultCRS.srsid() );
}

QApplication::setOverrideCursor( Qt::ArrowCursor );

if ( mySelector->exec() )
{
QgsDebugMsg( "Layer srs set from dialog: " + QString::number( mySelector->selectedCrsId() ) );
srs->createFromProj4( mySelector->selectedProj4String() );
}
else
{
QApplication::restoreOverrideCursor();
}

QApplication::restoreOverrideCursor();

delete mySelector;
}
else if ( myDefaultProjectionOption == "useProject" )
Expand Down Expand Up @@ -3017,7 +3017,7 @@ void QgisApp::newVectorLayer()
openFileDialog->selectFilter( lastUsedFilter );
}

if( openFileDialog->exec() == QDialog::Rejected )
if ( openFileDialog->exec() == QDialog::Rejected )
{
delete openFileDialog;
return;
Expand Down

0 comments on commit 82046b5

Please sign in to comment.