Avoid duplicate SVG paths

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15613 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 27, 2011 · 224874958b6854fd15f132745b29b12ba65361d1 · 2248749
1 parent 6d8ed98
commit 224874958b6854fd15f132745b29b12ba65361d1
Unified Split

Showing with 4 additions and 2 deletions.

+4 −2 src/core/qgsapplication.cpp
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -74,7 +74,6 @@ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled, QStri
     mConfigPath = customConfigPath + "/"; // make sure trailing slash is included
   }
 
-  mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );
   mDefaultSvgPaths << qgisSettingsDirPath() + QString( "svg/" );
 }
 
@@ -174,7 +173,10 @@ void QgsApplication::setPluginPath( const QString thePluginPath )
 void QgsApplication::setPkgDataPath( const QString thePkgDataPath )
 {
   mPkgDataPath = thePkgDataPath;
-  mDefaultSvgPaths << mPkgDataPath + QString( "/svg/" );
+  QString svgPath = mPkgDataPath + QString( "/svg/" );
+  // avoid duplicate entries
+  if ( !mDefaultSvgPaths.contains( svgPath ) )
+    mDefaultSvgPaths << svgPath;
 }
 
 void QgsApplication::setDefaultSvgPaths( const QStringList& pathList )