Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Delete zero-size output files when job fails or is aborted.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-02-15 00:45:42 +01:00
parent aefe4fa3ea
commit c66376096d
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thread_encode.cpp
View File

@ -49,12 +49,14 @@ QMutex EncodeThread::m_mutex_startProcess;
log("\nPROCESS ABORTED BY USER !!!"); \ log("\nPROCESS ABORTED BY USER !!!"); \
setStatus(JobStatus_Aborted); \ setStatus(JobStatus_Aborted); \
if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \ if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
return; \ return; \
} \ } \
else if(!(OK_FLAG)) \ else if(!(OK_FLAG)) \
{ \ { \
setStatus(JobStatus_Failed); \ setStatus(JobStatus_Failed); \
if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \ if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
return; \ return; \
} \ } \
} }

2
src/version.h
View File

@ -22,7 +22,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 0 #define VER_X264_MINOR 0
#define VER_X264_PATCH 2 #define VER_X264_PATCH 2
#define VER_X264_BUILD 199 #define VER_X264_BUILD 202
#define VER_X264_MINIMUM_REV 2146 #define VER_X264_MINIMUM_REV 2146
#define VER_X264_CURRENT_API 120 #define VER_X264_CURRENT_API 120

26
src/win_main.cpp
View File

@ -185,25 +185,16 @@ MainWindow::~MainWindow(void)
/* /*
* The "add" button was clicked * The "add" button was clicked
*/ */
void MainWindow::addButtonPressed(const QString &filePathIn, const QString &filePathOut, const OptionsModel *options, int fileNo, int fileTotal, bool *ok) void MainWindow::addButtonPressed(const QString &filePathIn, const QString &filePathOut, OptionsModel *options, int fileNo, int fileTotal, bool *ok)
{ {
qDebug("MainWindow::addButtonPressed"); qDebug("MainWindow::addButtonPressed");
if(ok) *ok = false; if(ok) *ok = false;
OptionsModel *optionsTemp = m_options;
bool ownsOptions = false;
if(options) AddJobDialog *addDialog = new AddJobDialog(this, options ? options : m_options, m_cpuFeatures->x64);
{
optionsTemp = new OptionsModel(*options);
ownsOptions = true;
}
AddJobDialog *addDialog = new AddJobDialog(this, optionsTemp, m_cpuFeatures->x64);
addDialog->setRunImmediately(countRunningJobs() < (m_preferences.autoRunNextJob ? m_preferences.maxRunningJobCount : 1)); addDialog->setRunImmediately(countRunningJobs() < (m_preferences.autoRunNextJob ? m_preferences.maxRunningJobCount : 1));
if(ownsOptions) addDialog->setWindowTitle(tr("Restart Job")); if(options) addDialog->setWindowTitle(tr("Restart Job"));
if((fileNo >= 0) && (fileTotal > 1)) addDialog->setWindowTitle(addDialog->windowTitle().append(tr(" (File %1 of %2)").arg(QString::number(fileNo+1), QString::number(fileTotal)))); if((fileNo >= 0) && (fileTotal > 1)) addDialog->setWindowTitle(addDialog->windowTitle().append(tr(" (File %1 of %2)").arg(QString::number(fileNo+1), QString::number(fileTotal))));
if(!filePathIn.isEmpty()) addDialog->setSourceFile(filePathIn); if(!filePathIn.isEmpty()) addDialog->setSourceFile(filePathIn);
if(!filePathOut.isEmpty()) addDialog->setOutputFile(filePathOut); if(!filePathOut.isEmpty()) addDialog->setOutputFile(filePathOut);
@ -215,7 +206,7 @@ void MainWindow::addButtonPressed(const QString &filePathIn, const QString &file
( (
addDialog->sourceFile(), addDialog->sourceFile(),
addDialog->outputFile(), addDialog->outputFile(),
optionsTemp, options ? options : m_options,
QString("%1/toolset").arg(m_appDir), QString("%1/toolset").arg(m_appDir),
m_cpuFeatures->x64, m_cpuFeatures->x64,
m_cpuFeatures->x64 && m_preferences.useAvisyth64Bit m_cpuFeatures->x64 && m_preferences.useAvisyth64Bit
@ -239,11 +230,6 @@ void MainWindow::addButtonPressed(const QString &filePathIn, const QString &file
} }
X264_DELETE(addDialog); X264_DELETE(addDialog);
if(ownsOptions)
{
X264_DELETE(optionsTemp);
}
} }
/* /*
@ -315,7 +301,9 @@ void MainWindow::restartButtonPressed(void)
if((options) && (!source.isEmpty()) && (!output.isEmpty())) if((options) && (!source.isEmpty()) && (!output.isEmpty()))
{ {
addButtonPressed(source, output, options); OptionsModel *tempOptions = new OptionsModel(*options);
addButtonPressed(source, output, tempOptions);
X264_DELETE(tempOptions);
} }
} }

2
src/win_main.h
View File

@ -69,7 +69,7 @@ private:
double detectAvisynthVersion(QLibrary *avsLib); double detectAvisynthVersion(QLibrary *avsLib);
private slots: private slots:
void addButtonPressed(const QString &filePathIn = QString(), const QString &filePathOut = QString(), const OptionsModel *options = NULL, int fileNo = -1, int fileTotal = 0, bool *ok = NULL); void addButtonPressed(const QString &filePathIn = QString(), const QString &filePathOut = QString(), OptionsModel *options = NULL, int fileNo = -1, int fileTotal = 0, bool *ok = NULL);
void abortButtonPressed(void); void abortButtonPressed(void);
void browseButtonPressed(void); void browseButtonPressed(void);
void deleteButtonPressed(void); void deleteButtonPressed(void);