From bfa197b0205217f6230e85ecfc2f4740d4ac5edb Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 20 Nov 2010 16:17:51 +0100 Subject: [PATCH] Workaround: QProcess::start() doesn't wrap arguments with white-spaces into quotes, unless the second parameter is passed in. This should fix the detection of the Nero encoder. --- src/Config.h | 2 +- src/Global.cpp | 2 +- src/Thread_Initialization.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Config.h b/src/Config.h index 6efa68d8..e65a5dd8 100644 --- a/src/Config.h +++ b/src/Config.h @@ -25,7 +25,7 @@ #define VER_LAMEXP_MAJOR 4 #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 0 -#define VER_LAMEXP_BUILD 50 +#define VER_LAMEXP_BUILD 51 #define VER_LAMEXP_SUFFIX TechPreview /* diff --git a/src/Global.cpp b/src/Global.cpp index 04e3542c..7715452f 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -546,7 +546,7 @@ const QString &lamexp_temp_folder(void) temp.mkpath("."); if(!temp.exists()) { - qFatal("The system's temporary directory does not exist:\n%s", temp.canonicalPath().toUtf8().constData()); + qFatal("The system's temporary directory does not exist:\n%s", temp.absolutePath().toUtf8().constData()); return g_lamexp_temp_folder; } } diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 73b7e5b1..5c101f0c 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -172,13 +172,13 @@ void InitializationThread::initNeroAac(void) QProcess process; process.setProcessChannelMode(QProcess::MergedChannels); process.setReadChannel(QProcess::StandardOutput); - process.start(neroFileInfo[0].canonicalFilePath()); + process.start(neroFileInfo[0].canonicalFilePath(), QStringList() << "-help"); if(!process.waitForStarted()) { qWarning("Nero process failed to create!"); qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData()); - qDebug("File '%s' does exist?\n%s\n!", neroFileInfo[0].canonicalFilePath().toUtf8().constData(), (neroFileInfo[0].exists() ? "Yes, it still exists" : "Nope, it disappeared")); + qDebug("File '%s' does exist?\n%s!\n", neroFileInfo[0].canonicalFilePath().toUtf8().constData(), (neroFileInfo[0].exists() ? "Yes, it still exists" : "Nope, it disappeared")); process.kill(); process.waitForFinished(-1); for(int i = 0; i < 3; i++) LAMEXP_DELETE(neroBin[i]);