Some improvements to init_process() function.

diff --git a/include/MUtils/Global.h b/include/MUtils/Global.h
index e25957d..3bd3a5a 100644 (file)
--- a/include/MUtils/Global.h
+++ b/include/MUtils/Global.h
@@ -76,7 +76,7 @@ namespace MUtils
        MUTILS_API const QString& temp_folder(void);
 
        //Process Utils
-       MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QString &extraPath = QString());
+       MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QStringList *const extraPaths = NULL);
 
        //Random
        MUTILS_API void seed_rand(void);

diff --git a/src/Global.cpp b/src/Global.cpp
index 26fd3bf..0c6260a 100644 (file)
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -37,6 +37,7 @@
 #include <QProcess>
 #include <QTextCodec>
 #include <QPair>
+#include <QListIterator>
 
 //CRT
 #include <cstdlib>
@@ -391,7 +392,7 @@ static void prependToPath(QProcessEnvironment &env, const QString &value)
        env.insert(PATH, path.isEmpty() ? value : QString("%1;%2").arg(value, path));
 }
 
-void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QString &extraPath)
+void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths)
 {
        //Environment variable names
        static const char *const s_envvar_names_temp[] =
@@ -427,9 +428,14 @@ void MUtils::init_process(QProcess &process, const QString &wokringDir, const bo
 
        //Setup PATH variable
        prependToPath(env, tempDir);
-       if (!extraPath.isEmpty())
+       if (extraPaths && (!extraPaths->isEmpty()))
        {
-               prependToPath(env, QDir::toNativeSeparators(extraPath));
+               QListIterator<QString> iter(*extraPaths);
+               iter.toBack();
+               while (iter.hasPrevious())
+               {
+                       prependToPath(env, QDir::toNativeSeparators(iter.previous()));
+               }
        }
        
        //Setup QPorcess object