Setup TMP and TEMP environment variables for *all* tools. Also add "$EXEDIR\QTfiles" to the PATH for QAAC.
This commit is contained in:
parent
3e7ae9642c
commit
6235115429
@ -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!)
|
||||
|
@ -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)
|
||||
|
@ -27,6 +27,8 @@
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QLibrary>
|
||||
#include <QProcessEnvironment>
|
||||
#include <QDir>
|
||||
|
||||
/*
|
||||
* 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");
|
||||
|
Loading…
x
Reference in New Issue
Block a user