Fix incorrect cursors shown in datum transform select dialog

nyalldawson · nyalldawson · commit 593f55f3386c · 2019-03-19T13:32:13.000+10:00
diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp
@@ -21,6 +21,7 @@
 #include "qgslogger.h"
 #include "qgssettings.h"
 #include "qgsproject.h"
+#include "qgsguiutils.h"
 
 #include <QDir>
 #include <QPushButton>
@@ -31,6 +32,7 @@ QgsDatumTransformDialog::QgsDatumTransformDialog( const QgsCoordinateReferenceSy
     QWidget *parent,
     Qt::WindowFlags f )
   : QDialog( parent, f )
+  , mPreviousCursorOverride( qgis::make_unique< QgsTemporaryCursorRestoreOverride >() ) // this dialog is often shown while cursor overrides are in place, so temporarily remove them
 {
   setupUi( this );
 
@@ -53,8 +55,6 @@ QgsDatumTransformDialog::QgsDatumTransformDialog( const QgsCoordinateReferenceSy
   mDestinationCrs = destinationCrs;
   mDatumTransforms = QgsDatumTransform::datumTransformations( sourceCrs, destinationCrs );
 
-  QApplication::setOverrideCursor( Qt::ArrowCursor );
-
   setOKButtonEnabled();
 
   QgsSettings settings;
@@ -172,8 +172,6 @@ QgsDatumTransformDialog::~QgsDatumTransformDialog()
   {
     settings.setValue( QStringLiteral( "Windows/DatumTransformDialog/columnWidths/%1" ).arg( i ), mDatumTransformTableWidget->columnWidth( i ) );
   }
-
-  QApplication::restoreOverrideCursor();
 }
 
 int QgsDatumTransformDialog::availableTransformationCount()
diff --git a/src/gui/qgsdatumtransformdialog.h b/src/gui/qgsdatumtransformdialog.h
@@ -23,6 +23,8 @@
 #include "qgscoordinatetransform.h"
 #include "qgis_gui.h"
 
+class QgsTemporaryCursorRestoreOverride;
+
 #define SIP_NO_FILE
 
 /**
@@ -74,6 +76,7 @@ class GUI_EXPORT QgsDatumTransformDialog : public QDialog, private Ui::QgsDatumT
     QList< QgsDatumTransform::TransformPair > mDatumTransforms;
     QgsCoordinateReferenceSystem mSourceCrs;
     QgsCoordinateReferenceSystem mDestinationCrs;
+    std::unique_ptr< QgsTemporaryCursorRestoreOverride > mPreviousCursorOverride;
 };
 
 #endif // QGSDATUMTRANSFORMDIALOG_H
