summaryrefslogtreecommitdiff
path: root/rotord/src/rendercontext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/src/rendercontext.cpp')
-rw-r--r--rotord/src/rendercontext.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index b40b385..d88bd68 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -420,11 +420,16 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
}
if (command.commands[1]=="cancel") {
if (command.method=="PUT") {
- if (state==RENDERING||state==ANALYSING_AUDIO){
+ if (state==RENDERING){
graph.cancelled=true;
logger.information("Render cancelled.");
XML.addValue("status","render cancelled");
}
+ else if (state==ANALYSING_AUDIO){
+ graph.cancelled=true;
+ logger.information("Audio analysis cancelled.");
+ XML.addValue("status","audio analysis cancelled");
+ }
else {
status=HTTPResponse::HTTP_BAD_REQUEST;
logger.error("ERROR: no process to cancel");