Skip to content
Permalink
Browse files

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

  • Loading branch information
nirvn committed Jan 10, 2018
1 parent 744f5ac commit df3f663c14b5a7d7a861a16bce56080eb595c738
Showing with 7 additions and 7 deletions.
  1. +7 −7 src/app/qgisapp.cpp
@@ -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();

0 comments on commit df3f663

Please sign in to comment.
You can’t perform that action at this time.