From 239877fc187d0ade76812f865a7190ca7102508e Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 8 Dec 2017 17:47:57 -0800 Subject: [PATCH] Remove _didFinish from BakeAssetTask --- assignment-client/src/assets/BakeAssetTask.cpp | 4 ---- assignment-client/src/assets/BakeAssetTask.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp index 69123e4909..396857bf3a 100644 --- a/assignment-client/src/assets/BakeAssetTask.cpp +++ b/assignment-client/src/assets/BakeAssetTask.cpp @@ -78,7 +78,6 @@ void BakeAssetTask::run() { if (_wasAborted) { emit bakeAborted(_assetHash, _assetPath); } else { - _didFinish.store(true); QString errors = "Fatal error occurred while baking"; emit bakeFailed(_assetHash, _assetPath, errors); } @@ -90,7 +89,6 @@ void BakeAssetTask::run() { outputFiles.push_back(file.absoluteFilePath()); } - _didFinish.store(true); emit bakeComplete(_assetHash, _assetPath, tempOutputDir, outputFiles); } else if (exitStatus == QProcess::NormalExit && exitCode == OVEN_STATUS_CODE_ABORT) { _wasAborted.store(true); @@ -98,7 +96,6 @@ void BakeAssetTask::run() { } else { QString errors; if (exitCode == OVEN_STATUS_CODE_FAIL) { - _didFinish.store(true); auto errorFilePath = _outputDir.absoluteFilePath("errors.txt"); QFile errorFile { errorFilePath }; if (errorFile.open(QIODevice::ReadOnly)) { @@ -116,7 +113,6 @@ void BakeAssetTask::run() { qDebug() << "Starting oven for " << _assetPath; _ovenProcess->start(path, args, QIODevice::ReadOnly); if (!_ovenProcess->waitForStarted(-1)) { - _didFinish.store(true); QString errors = "Oven process failed to start"; emit bakeFailed(_assetHash, _assetPath, errors); return; diff --git a/assignment-client/src/assets/BakeAssetTask.h b/assignment-client/src/assets/BakeAssetTask.h index d6c2446df5..edbce4c1d4 100644 --- a/assignment-client/src/assets/BakeAssetTask.h +++ b/assignment-client/src/assets/BakeAssetTask.h @@ -33,7 +33,6 @@ public: void abort(); bool wasAborted() const { return _wasAborted.load(); } - bool didFinish() const { return _didFinish.load(); } signals: void bakeComplete(QString assetHash, QString assetPath, QString tempOutputDir, QVector outputFiles); @@ -48,7 +47,6 @@ private: QDir _outputDir; std::unique_ptr _ovenProcess { nullptr }; std::atomic _wasAborted { false }; - std::atomic _didFinish { false }; }; #endif // hifi_BakeAssetTask_h