From 623511542900d0b911e09a6e01bd10805994d723 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Tue, 22 Nov 2011 12:43:32 +0100 Subject: [PATCH] Setup TMP and TEMP environment variables for *all* tools. Also add "$EXEDIR\QTfiles" to the PATH for QAAC. --- src/Config.h | 2 +- src/Encoder_AAC_QAAC.cpp | 4 +--- src/Tool_Abstract.cpp | 9 ++++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Config.h b/src/Config.h index 91f20033..02af1f70 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 784 +#define VER_LAMEXP_BUILD 785 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Encoder_AAC_QAAC.cpp b/src/Encoder_AAC_QAAC.cpp index 754327bf..a30377ca 100644 --- a/src/Encoder_AAC_QAAC.cpp +++ b/src/Encoder_AAC_QAAC.cpp @@ -53,9 +53,7 @@ bool QAACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath()); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("PATH", QString("%1;%2").arg(QDir::toNativeSeparators(QDir(QCoreApplication::applicationDirPath()).canonicalPath()), QDir::toNativeSeparators(lamexp_temp_folder2()))); - env.insert("TEMP", QDir::toNativeSeparators(lamexp_temp_folder2())); - env.insert("TMP", QDir::toNativeSeparators(lamexp_temp_folder2())); + env.insert("PATH", QDir::toNativeSeparators(QString("%1;%1/QTfiles;%2").arg(QDir(QCoreApplication::applicationDirPath()).canonicalPath(), lamexp_temp_folder2()))); process.setProcessEnvironment(env); if(m_configRCMode != SettingsModel::VBRMode) diff --git a/src/Tool_Abstract.cpp b/src/Tool_Abstract.cpp index f2711bea..2bb5add4 100644 --- a/src/Tool_Abstract.cpp +++ b/src/Tool_Abstract.cpp @@ -27,6 +27,8 @@ #include #include #include +#include +#include /* * Win32 API definitions @@ -97,9 +99,14 @@ bool AbstractTool::startProcess(QProcess &process, const QString &program, const static AssignProcessToJobObjectFun AssignProcessToJobObjectPtr = NULL; QMutexLocker lock(m_mutex_startProcess); - emit messageLogged(commandline2string(program, args) + "\n"); + QProcessEnvironment env = process.processEnvironment(); + if(env.isEmpty()) env = QProcessEnvironment::systemEnvironment(); + env.insert("TEMP", QDir::toNativeSeparators(lamexp_temp_folder2())); + env.insert("TMP", QDir::toNativeSeparators(lamexp_temp_folder2())); + process.setProcessEnvironment(env); + if(!AssignProcessToJobObjectPtr) { QLibrary Kernel32Lib("kernel32.dll");