fix #2753

jef · jef · commit 82046b5e0321 · 2010-05-29T15:47:25.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13595 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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
@@ -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" )
@@ -3017,7 +3017,7 @@ void QgisApp::newVectorLayer()
     openFileDialog->selectFilter( lastUsedFilter );
   }
 
-  if( openFileDialog->exec() == QDialog::Rejected )
+  if ( openFileDialog->exec() == QDialog::Rejected )
   {
     delete openFileDialog;
     return;

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )`
`311`	`311`	`{`
`312`	`312`	`QString toProj4;`
`313`	`313`	`QSettings mySettings;`
`314`		`- QString myDefaultProjectionOption =`
`315`		`- mySettings.value( "/Projections/defaultBehaviour" ).toString();`
	`314`	`+ QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();`
`316`	`315`	`if ( myDefaultProjectionOption == "prompt" )`
`317`	`316`	`{`
`318`	`317`	`//@note this class is not a descendent of QWidget so we cant pass`
`@@ -327,15 +326,16 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )`
`327`	`326`	`mySelector->setSelectedCrsId( defaultCRS.srsid() );`
`328`	`327`	`}`
`329`	`328`
	`329`	`+ QApplication::setOverrideCursor( Qt::ArrowCursor );`
	`330`	`+`
`330`	`331`	`if ( mySelector->exec() )`
`331`	`332`	`{`
`332`	`333`	`QgsDebugMsg( "Layer srs set from dialog: " + QString::number( mySelector->selectedCrsId() ) );`
`333`	`334`	`srs->createFromProj4( mySelector->selectedProj4String() );`
`334`	`335`	`}`
`335`		`- else`
`336`		`- {`
`337`		`- QApplication::restoreOverrideCursor();`
`338`		`- }`
	`336`	`+`
	`337`	`+ QApplication::restoreOverrideCursor();`
	`338`	`+`
`339`	`339`	`delete mySelector;`
`340`	`340`	`}`
`341`	`341`	`else if ( myDefaultProjectionOption == "useProject" )`
`@@ -3017,7 +3017,7 @@ void QgisApp::newVectorLayer()`
`3017`	`3017`	`openFileDialog->selectFilter( lastUsedFilter );`
`3018`	`3018`	`}`
`3019`	`3019`
`3020`		`- if( openFileDialog->exec() == QDialog::Rejected )`
	`3020`	`+ if ( openFileDialog->exec() == QDialog::Rejected )`
`3021`	`3021`	`{`
`3022`	`3022`	`delete openFileDialog;`
`3023`	`3023`	`return;`