Defer connection deletion until everything has cleaned up

qgis · Nov 16, 2022 · 5579a4e · 5579a4e
1 parent 9b8be60
commit 5579a4e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/gps/qgsappgpsconnection.cpp b/src/app/gps/qgsappgpsconnection.cpp
@@ -160,15 +160,17 @@ void QgsAppGpsConnection::disconnectGps()
 {
   if ( mConnection )
   {
-    QgsApplication::gpsConnectionRegistry()->unregisterConnection( mConnection );
-    delete mConnection;
+    // we don't actually delete the connection until everything has had time to respond to the cleanup signals
+    std::unique_ptr< QgsGpsConnection > oldConnection( mConnection );
     mConnection = nullptr;
 
     emit disconnected();
     emit statusChanged( Qgis::GpsConnectionStatus::Disconnected );
     emit fixStatusChanged( Qgis::GpsFixStatus::NoData );
 
     showStatusBarMessage( tr( "Disconnected from GPS device." ) );
+
+    QgsApplication::gpsConnectionRegistry()->unregisterConnection( oldConnection.get() );
   }
 }