sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

[authentification manager] fix auth exec error (#6020)

Browse Source
This commit is contained in:
Mathieu Pellerin 2018-01-10 07:50:48 +07:00 committed by GitHub
parent 744f5acdac
commit df3f663c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/qgisapp.cpp
View File

@ -703,6 +703,13 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
mSplash->showMessage( tr( "Setting up the GUI" ), Qt::AlignHCenter | Qt::AlignBottom );
qApp->processEvents();
QgsApplication::initQgis();
if ( !QgsApplication::authManager()->isDisabled() )
{
// Most of the auth initialization is now done inside initQgis, no need to profile here
masterPasswordSetup();
}
QgsSettings settings;
startProfile( QStringLiteral( "Building style sheet" ) );
@ -1032,13 +1039,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
// load providers
mSplash->showMessage( tr( "Checking provider plugins" ), Qt::AlignHCenter | Qt::AlignBottom );
qApp->processEvents();
QgsApplication::initQgis();
if ( !QgsApplication::authManager()->isDisabled() )
{
// Most of the auth initialization is now done inside initQgis, no need to profile here
masterPasswordSetup();
}
// Setup QgsNetworkAccessManager (this needs to happen after authentication, for proxy settings)
namSetup();