unabling project reloading after project sync

MerginMaps · Apr 30, 2024 · 293bf68 · 293bf68
1 parent a7a1ea3
commit 293bf68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/app/main.cpp b/app/main.cpp
@@ -581,14 +581,10 @@ int main( int argc, char *argv[] )
   QObject::connect( &pw, &ProjectWizard::projectCreated, &localProjectsManager, &LocalProjectsManager::addLocalProject );
   QObject::connect( &activeProject, &ActiveProject::projectReloaded, vm.get(), &VariablesManager::merginProjectChanged );
   QObject::connect( &activeProject, &ActiveProject::projectWillBeReloaded, &inputProjUtils, &InputProjUtils::resetHandlers );
-  QObject::connect( &syncManager, &SynchronizationManager::syncFinished, &activeProject, [&activeProject]( const QString & projectFullName, bool successfully, int version, bool reloadNeeded )
+  QObject::connect( &syncManager, &SynchronizationManager::syncFinished, &activeProject, [&activeProject]( const QString & projectFullName, bool successfully, int version )
   {
     Q_UNUSED( successfully );
     Q_UNUSED( version );
-    if ( reloadNeeded && activeProject.projectFullName() == projectFullName )
-    {
-      activeProject.reloadProject( activeProject.qgsProject()->homePath() );
-    }
   } );
   QObject::connect( QgsApplication::messageLog(),
                     static_cast<void ( QgsMessageLog::* )( const QString &message, const QString &tag, Qgis::MessageLevel level )>( &QgsMessageLog::messageReceived ),

diff --git a/app/synchronizationmanager.cpp b/app/synchronizationmanager.cpp
@@ -189,7 +189,6 @@ void SynchronizationManager::onProjectSyncFinished( const QString &projectFullNa
   if ( mSyncProcesses.contains( projectFullName ) )
   {
     SyncProcess &process = mSyncProcesses[projectFullName];
-    bool reloadNeeded = process.reloadProject;
 
     if ( !successfully && process.awaitsRetry )
     {
@@ -202,7 +201,7 @@ void SynchronizationManager::onProjectSyncFinished( const QString &projectFullNa
       mSyncProcesses.remove( projectFullName );
     }
 
-    emit syncFinished( projectFullName, successfully, version, reloadNeeded );
+    emit syncFinished( projectFullName, successfully, version );
   }
 }
 
@@ -273,7 +272,7 @@ void SynchronizationManager::onProjectSyncFailure(
   else
   {
     mSyncProcesses.remove( projectFullName );
-    emit syncFinished( projectFullName, false, -1, false );
+    emit syncFinished( projectFullName, false, -1 );
 
     return;
   }

diff --git a/app/synchronizationmanager.h b/app/synchronizationmanager.h
@@ -61,7 +61,7 @@ class SynchronizationManager : public QObject
     void syncStarted( const QString &projectFullName );
     void syncCancelled( const QString &projectFullName );
     void syncProgressChanged( const QString &projectFullName, qreal progress );
-    void syncFinished( const QString &projectFullName, bool success, int newVersion, bool reloadNeeded );
+    void syncFinished( const QString &projectFullName, bool success, int newVersion );
 
     void syncError( const QString &projectFullName, int errorType, bool willRetry = false, const QString &errorMessage = QLatin1String() );