Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Disable also plugins in user specified directories when running with …
…--noplugins option
  • Loading branch information
borysiasty committed May 13, 2013
1 parent fe072c5 commit f216ddd
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/app/qgisapp.cpp
Expand Up @@ -618,14 +618,14 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
// Restoring of plugins can be disabled with --noplugins command line option
// because some plugins may cause QGIS to crash during startup
QgsPluginRegistry::instance()->restoreSessionPlugins( QgsApplication::pluginPath() );
}

// Also restore plugins from user specified plugin directories - added for 1.7
QString myPaths = settings.value( "plugins/searchPathsForPlugins", "" ).toString();
if ( !myPaths.isEmpty() )
{
QStringList myPathList = myPaths.split( "|" );
QgsPluginRegistry::instance()->restoreSessionPlugins( myPathList );
// Also restore plugins from user specified plugin directories - added for 1.7
QString myPaths = settings.value( "plugins/searchPathsForPlugins", "" ).toString();
if ( !myPaths.isEmpty() )
{
QStringList myPathList = myPaths.split( "|" );
QgsPluginRegistry::instance()->restoreSessionPlugins( myPathList );
}
}

mSplash->showMessage( tr( "Initializing file filters" ), Qt::AlignHCenter | Qt::AlignBottom );
Expand Down

0 comments on commit f216ddd

Please sign in to comment.