create an error type for when the server kills the render (before it was part of NOOUTPUTFILE)

This commit is contained in:
Laurent Clouet
2016-11-01 19:44:09 +01:00
parent aacf0d407e
commit ea50176133
4 changed files with 18 additions and 1 deletions

View File

@@ -63,6 +63,7 @@ public class Job {
private RenderProcess render;
private boolean askForRendererKill;
private boolean userBlockJob;
private boolean serverBlockJob;
private Gui gui;
private Configuration config;
private Log log;
@@ -86,6 +87,7 @@ public class Job {
updateRenderingStatusMethod = update_method_;
askForRendererKill = false;
userBlockJob = false;
serverBlockJob = false;
log = log_;
render = new RenderProcess();
}
@@ -146,6 +148,14 @@ public class Job {
return userBlockJob;
}
public void setServerBlockJob(boolean val) {
serverBlockJob = val;
}
public boolean getServerBlockJob() {
return serverBlockJob;
}
public String getRenderCommand() {
return rendererCommand;
}
@@ -346,6 +356,9 @@ public class Job {
if (files.length != 0) {
new File(files[0].getAbsolutePath()).delete();
}
if (getServerBlockJob()) {
return Error.Type.RENDERER_KILLED_BY_SERVER;
}
if (getUserBlockJob()) {
return Error.Type.RENDERER_KILLED_BY_USER;
}