From d45f5ade97ababe01842ebb5d1efc12633f2fadf Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 19 Jan 2017 13:26:48 -0800 Subject: [PATCH] Update Entities.getServerScriptStatus to return more information --- .../entities/src/EntityScriptingInterface.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index bba9347cff..ea02a2d5fa 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -680,7 +680,22 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu auto client = DependencyManager::get(); auto request = client->createScriptStatusRequest(entityID); connect(request, &GetScriptStatusRequest::finished, callback.engine(), [callback](GetScriptStatusRequest* request) mutable { - QScriptValueList args { true }; + QString statusString; + switch (request->status) { + case RUNNING: + statusString = "running"; + break; + case ERROR_LOADING_SCRIPT: + statusString = "error_loading_script"; + break; + case ERROR_RUNNING_SCRIPT: + statusString = "error_running_script"; + break; + default: + statusString = ""; + break; + } + QScriptValueList args { request->responseReceived, request->isRunning, statusString, request->errorInfo }; callback.call(QScriptValue(), args); request->deleteLater(); });