From d76fe7939f8d89a5bdedf7f48ba9a063b809fd53 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 9 Feb 2022 12:26:47 +1000
Subject: [PATCH] Never silently overwrite gcp point files without prompting
 user

---
 src/app/georeferencer/qgsgeorefmainwindow.cpp | 18 +-----------------
 src/app/georeferencer/qgsgeorefmainwindow.h   |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/app/georeferencer/qgsgeorefmainwindow.cpp b/src/app/georeferencer/qgsgeorefmainwindow.cpp
index 09e8e27532d0..f1a4905144cd 100644
--- a/src/app/georeferencer/qgsgeorefmainwindow.cpp
+++ b/src/app/georeferencer/qgsgeorefmainwindow.cpp
@@ -164,13 +164,6 @@ void QgsGeoreferencerMainWindow::closeEvent( QCloseEvent *e )
       mRasterFileName.clear();
       e->accept();
       return;
-    case QgsGeoreferencerMainWindow::GCPSILENTSAVE:
-      if ( !mGCPpointsFileName.isEmpty() )
-        saveGCPs();
-      clearGCPData();
-      removeOldLayer();
-      mRasterFileName.clear();
-      return;
     case QgsGeoreferencerMainWindow::GCPDISCARD:
       writeSettings();
       clearGCPData();
@@ -213,10 +206,6 @@ void QgsGeoreferencerMainWindow::openRaster( const QString &fileName )
     case QgsGeoreferencerMainWindow::GCPSAVE:
       saveGCPsDialog();
       break;
-    case QgsGeoreferencerMainWindow::GCPSILENTSAVE:
-      if ( !mGCPpointsFileName.isEmpty() )
-        saveGCPs();
-      break;
     case QgsGeoreferencerMainWindow::GCPDISCARD:
       break;
     case QgsGeoreferencerMainWindow::GCPCANCEL:
@@ -1289,13 +1278,8 @@ QgsGeoreferencerMainWindow::SaveGCPs QgsGeoreferencerMainWindow::checkNeedGCPSav
     {
       return QgsGeoreferencerMainWindow::GCPCANCEL;
     }
-    else if ( a == QMessageBox::Discard )
-    {
-      return QgsGeoreferencerMainWindow::GCPDISCARD;
-    }
   }
-
-  return QgsGeoreferencerMainWindow::GCPSILENTSAVE;
+  return QgsGeoreferencerMainWindow::GCPDISCARD;
 }
 
 // Georeference
diff --git a/src/app/georeferencer/qgsgeorefmainwindow.h b/src/app/georeferencer/qgsgeorefmainwindow.h
index b88bd48ffe24..4b05e2b6a580 100644
--- a/src/app/georeferencer/qgsgeorefmainwindow.h
+++ b/src/app/georeferencer/qgsgeorefmainwindow.h
@@ -139,7 +139,6 @@ class QgsGeoreferencerMainWindow : public QMainWindow, private Ui::QgsGeorefPlug
     enum SaveGCPs
     {
       GCPSAVE,
-      GCPSILENTSAVE,
       GCPDISCARD,
       GCPCANCEL
     };