From 65649fc331c7374ef16fefc90a47b5ac91c5d08f Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 8 Dec 2017 17:56:33 -0800 Subject: [PATCH] Remove _outputDir from BakeAssetTask --- assignment-client/src/assets/BakeAssetTask.cpp | 7 ++++--- assignment-client/src/assets/BakeAssetTask.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp index fe717ab285..49322ca4cb 100644 --- a/assignment-client/src/assets/BakeAssetTask.cpp +++ b/assignment-client/src/assets/BakeAssetTask.cpp @@ -58,7 +58,6 @@ void BakeAssetTask::run() { } QString tempOutputDir = PathUtils::generateTemporaryDir(); - _outputDir = tempOutputDir; auto base = QFileInfo(QCoreApplication::applicationFilePath()).absoluteDir(); QString path = base.absolutePath() + "/oven"; QString extension = _assetPath.mid(_assetPath.lastIndexOf('.') + 1); @@ -82,7 +81,8 @@ void BakeAssetTask::run() { emit bakeFailed(_assetHash, _assetPath, errors); } } else if (exitCode == OVEN_STATUS_CODE_SUCCESS) { - auto files = _outputDir.entryInfoList(QDir::Files); + QDir outputDir = tempOutputDir; + auto files = outputDir.entryInfoList(QDir::Files); QVector outputFiles; for (auto& file : files) { outputFiles.push_back(file.absoluteFilePath()); @@ -95,7 +95,8 @@ void BakeAssetTask::run() { } else { QString errors; if (exitCode == OVEN_STATUS_CODE_FAIL) { - auto errorFilePath = _outputDir.absoluteFilePath("errors.txt"); + QDir outputDir = tempOutputDir; + auto errorFilePath = outputDir.absoluteFilePath("errors.txt"); QFile errorFile { errorFilePath }; if (errorFile.open(QIODevice::ReadOnly)) { errors = errorFile.readAll(); diff --git a/assignment-client/src/assets/BakeAssetTask.h b/assignment-client/src/assets/BakeAssetTask.h index edbce4c1d4..c73a8bff65 100644 --- a/assignment-client/src/assets/BakeAssetTask.h +++ b/assignment-client/src/assets/BakeAssetTask.h @@ -44,7 +44,6 @@ private: AssetHash _assetHash; AssetPath _assetPath; QString _filePath; - QDir _outputDir; std::unique_ptr _ovenProcess { nullptr }; std::atomic _wasAborted { false }; };