[auth] bulletproof QgsAuthManager singleton to make server happy

qgis · Oct 26, 2017 · 5571a87 · 5571a87
1 parent 4c7e3ff
commit 5571a87
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -876,7 +876,6 @@ void QgsApplication::initQgis()
   QgsProject::instance();
 
   // Initialize authentication manager and connect to database
-  instance()->mAuthManager = QgsAuthManager::instance();
   authManager()->init( pluginPath(), qgisAuthDatabaseFilePath() );
 
   // Make sure we have a NAM created on the main thread.
@@ -890,6 +889,10 @@ void QgsApplication::initQgis()
 
 QgsAuthManager *QgsApplication::authManager()
 {
+  if ( ! instance()->mAuthManager )
+  {
+    instance()->mAuthManager = QgsAuthManager::instance();
+  }
   return instance()->mAuthManager;
 }