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

diff --git a/src/thread_encode.cpp b/src/thread_encode.cpp
index c7fd85a..affd898 100644 (file)
--- a/src/thread_encode.cpp
+++ b/src/thread_encode.cpp
@@ -49,12 +49,14 @@ QMutex EncodeThread::m_mutex_startProcess;
                log("\nPROCESS ABORTED BY USER !!!"); \
                setStatus(JobStatus_Aborted); \
                if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
+               if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
                return; \
        } \
        else if(!(OK_FLAG)) \
        { \
                setStatus(JobStatus_Failed); \
                if(QFileInfo(indexFile).exists()) QFile::remove(indexFile); \
+               if(QFileInfo(m_outputFileName).exists() && (QFileInfo(m_outputFileName).size() == 0)) QFile::remove(m_outputFileName); \
                return; \
        } \
 }

diff --git a/src/version.h b/src/version.h
index 79de599..b18fcd1 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -22,7 +22,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
 #define VER_X264_PATCH 2
-#define VER_X264_BUILD 199
+#define VER_X264_BUILD 202
 
 #define VER_X264_MINIMUM_REV 2146
 #define VER_X264_CURRENT_API 120

diff --git a/src/win_main.cpp b/src/win_main.cpp
index d6893ea..b2a6e93 100644 (file)
--- a/src/win_main.cpp
+++ b/src/win_main.cpp
@@ -185,25 +185,16 @@ MainWindow::~MainWindow(void)
 /*
  * 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");
        
        if(ok) *ok = false;
-       
-       OptionsModel *optionsTemp = m_options;
-       bool ownsOptions = false;
-
-       if(options)
-       {
-               optionsTemp = new OptionsModel(*options);
-               ownsOptions = true;
-       }
 
-       AddJobDialog *addDialog = new AddJobDialog(this, optionsTemp, m_cpuFeatures->x64);
+       AddJobDialog *addDialog = new AddJobDialog(this, options ? options : m_options, m_cpuFeatures->x64);
        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(!filePathIn.isEmpty()) addDialog->setSourceFile(filePathIn);
        if(!filePathOut.isEmpty()) addDialog->setOutputFile(filePathOut);
@@ -215,7 +206,7 @@ void MainWindow::addButtonPressed(const QString &filePathIn, const QString &file
                (
                        addDialog->sourceFile(),
                        addDialog->outputFile(),
-                       optionsTemp,
+                       options ? options : m_options,
                        QString("%1/toolset").arg(m_appDir),
                        m_cpuFeatures->x64,
                        m_cpuFeatures->x64 && m_preferences.useAvisyth64Bit
@@ -239,11 +230,6 @@ void MainWindow::addButtonPressed(const QString &filePathIn, const QString &file
        }
        
        X264_DELETE(addDialog);
-       
-       if(ownsOptions)
-       {
-               X264_DELETE(optionsTemp);
-       }
 }
 
 /*
@@ -315,7 +301,9 @@ void MainWindow::restartButtonPressed(void)
 
        if((options) && (!source.isEmpty()) && (!output.isEmpty()))
        {
-               addButtonPressed(source, output, options);
+               OptionsModel *tempOptions = new OptionsModel(*options);
+               addButtonPressed(source, output, tempOptions);
+               X264_DELETE(tempOptions);
        }
 }
 

diff --git a/src/win_main.h b/src/win_main.h
index 6471140..e6a85bb 100644 (file)
--- a/src/win_main.h
+++ b/src/win_main.h
@@ -69,7 +69,7 @@ private:
        double detectAvisynthVersion(QLibrary *avsLib);
 
 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 browseButtonPressed(void);
        void deleteButtonPressed(void);