From 8a17cddfde7c89c7c626b3ec26c43e35374770f2 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Mon, 29 Aug 2016 18:06:17 +0200
Subject: [PATCH] Bugfix: check kill request before check render output

---
 src/com/sheepit/client/Job.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java
index c5b25ca..5fbd21e 100644
--- a/src/com/sheepit/client/Job.java
+++ b/src/com/sheepit/client/Job.java
@@ -336,17 +336,20 @@ public class Job {
 		
 		File[] files = config.workingDirectory.listFiles(textFilter);
 		
+		if (getAskForRendererKill()) {
+			log.debug("Job::render been asked to end render");
+			if (files.length != 0) {
+				new File(files[0].getAbsolutePath()).delete();
+			}
+			if (getUserBlockJob()) {
+				return Error.Type.RENDERER_KILLED_BY_USER;
+			}
+			return Error.Type.RENDERER_KILLED;
+		}
+		
 		if (files.length == 0) {
 			log.error("Job::render no picture file found (after finished render (filename_without_extension " + filename_without_extension + ")");
 			
-			if (getAskForRendererKill()) {
-				log.debug("Job::render renderer didn't generate any frame but died due to a kill request");
-				if (getUserBlockJob()) {
-					return Error.Type.RENDERER_KILLED_BY_USER;
-				}
-				return Error.Type.RENDERER_KILLED;
-			}
-			
 			String basename = "";
 			try {
 				basename = getPath().substring(0, getPath().lastIndexOf('.'));