Skip to content

Commit

Permalink
[authentification manager] fix auth exec error (#6020)
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn authored Jan 10, 2018
1 parent 744f5ac commit df3f663
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" ) );
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit df3f663

Please sign in to comment.