From 2eecb4133777d88d7847ec236e201d6d77449661 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 6 Dec 2017 13:59:46 -0800
Subject: [PATCH] Update metatype registration in assetBakeTask

---
 assignment-client/src/assets/BakeAssetTask.cpp | 10 ++++++++--
 libraries/shared/src/PathUtils.cpp             |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp
index 58983f4660..427f41c494 100644
--- a/assignment-client/src/assets/BakeAssetTask.cpp
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -11,6 +11,8 @@
 
 #include "BakeAssetTask.h"
 
+#include <mutex>
+
 #include <QtCore/QThread>
 #include <QCoreApplication>
 
@@ -20,14 +22,18 @@ static const int OVEN_STATUS_CODE_SUCCESS { 0 };
 static const int OVEN_STATUS_CODE_FAIL { 1 };
 static const int OVEN_STATUS_CODE_ABORT { 2 };
 
+std::once_flag registerMetaTypesFlag;
+
 BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath) :
     _assetHash(assetHash),
     _assetPath(assetPath),
     _filePath(filePath)
 {
-    qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
-    qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
 
+    std::call_once(registerMetaTypesFlag, []() {
+        qRegisterMetaType<QProcess::ProcessError>("QProcess::ProcessError");
+        qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
+    });
 }
 
 void cleanupTempFiles(QString tempOutputDir, std::vector<QString> files) {
diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 5c32e746b5..4ec35e491e 100644
--- a/libraries/shared/src/PathUtils.cpp
+++ b/libraries/shared/src/PathUtils.cpp
@@ -98,11 +98,11 @@ int PathUtils::removeTemporaryApplicationDirs(QString appName) {
             auto pid = match.capturedRef("pid").toLongLong();
             auto timestamp = match.capturedRef("timestamp");
             if (!processIsRunning(pid)) {
-                qDebug() << "  Removing old temporary directory: " << absoluteDirPath;
+                qDebug() << "  Removing old temporary directory: " << dir.absoluteFilePath();
                 absoluteDirPath.removeRecursively();
                 removed++;
             } else {
-                qDebug() << "  Not removing (process is running): " << dir.absoluteDir();
+                qDebug() << "  Not removing (process is running): " << dir.absoluteFilePath();
             }
         }
     }