Don't create a provider registry instance only to delete it

Clears up more debugging noise in crssync
qgis · Jun 11, 2019 · 296bfde · 296bfde
1 parent 5855204
commit 296bfde
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1229,7 +1229,9 @@ void QgsApplication::exitQgis()
 
   delete QgsProject::instance();
 
-  delete QgsProviderRegistry::instance();
+  // avoid creating instance just to delete it!
+  if ( QgsProviderRegistry::exists() )
+    delete QgsProviderRegistry::instance();
 
   // invalidate coordinate cache while the PROJ context held by the thread-locale
   // QgsProjContextStore object is still alive. Otherwise if this later object

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -2901,8 +2901,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
     return -1;
   }
 
-  Q_UNUSED( deleted )
-  QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 0 );
+  QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 4 );
 
   if ( errors > 0 )
     return -errors;

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -291,6 +291,11 @@ void QgsProviderRegistry::clean()
   mProviders.clear();
 }
 
+bool QgsProviderRegistry::exists()
+{
+  return static_cast< bool >( sInstance );
+}
+
 QgsProviderRegistry::~QgsProviderRegistry()
 {
   clean();

diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
@@ -296,6 +296,13 @@ class CORE_EXPORT QgsProviderRegistry
      */
     QString mProtocolDrivers;
 
+    /**
+     * Returns TRUE if registry instance exists.
+     */
+    static bool exists();
+
+    friend class QgsApplication;
+
 }; // class QgsProviderRegistry
 
 #endif //QGSPROVIDERREGISTRY_H