Merge pull request #1195 from Oslandia/issue9599

jef-n · jef-n · commit c4b0ecd25a24 · 2014-02-19T16:40:12.000+01:00
Fix windows path escaping for QGIS_PLUGINPATH
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -82,16 +82,16 @@ void QgsPythonUtilsImpl::initPython( QgisInterface* interface )
   QStringList pluginpaths;
   foreach ( QString p, extraPluginsPaths() )
   {
-#ifdef Q_OS_WIN
-    p = p.replace( '\\', "\\\\" );
-#endif
     if ( !QDir( p ).exists() )
     {
       QgsMessageOutput* msg = QgsMessageOutput::createMessageOutput();
       msg->setTitle( QObject::tr( "Python error" ) );
       msg->setMessage( QString( QObject::tr( "The extra plugin path '%1' does not exist !" ) ).arg( p ), QgsMessageOutput::MessageText );
       msg->showMessage();
     }
+#ifdef Q_OS_WIN
+    p = p.replace( '\\', "\\\\" );
+#endif
     // we store here paths in unicode strings
     // the str constant will contain utf8 code (through runString)
     // so we call '...'.decode('utf-8') to make a unicode string
