From c18bd5b1bb16fec4d77b3b4a494d11e6209eeff7 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Sat, 9 Sep 2023 13:17:15 +0200 Subject: [PATCH] Fix: do no desync data on error send --- src/main/java/com/sheepit/client/Client.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/com/sheepit/client/Client.java b/src/main/java/com/sheepit/client/Client.java index c61a694..5f6c6b5 100644 --- a/src/main/java/com/sheepit/client/Client.java +++ b/src/main/java/com/sheepit/client/Client.java @@ -463,6 +463,7 @@ import okhttp3.HttpUrl; gui.error("Client::run problem with confirmJob (returned " + ret + ")"); sendError(step, this.renderingJob, Error.Type.VALIDATION_FAILED); } + this.renderingJob = null; } else { this.gui.status(String.format("Queuing frame for upload (%.2fMB)", (this.renderingJob.getOutputImageSize() / 1024.0 / 1024.0))); @@ -704,18 +705,6 @@ import okhttp3.HttpUrl; this.log.debug("Client::sendError Exception " + e + " stacktrace: " + sw.toString()); // no exception should be raised to actual launcher (applet or standalone) } - - if (error != null && (error == Error.Type.RENDERER_CRASHED || error == Error.Type.RENDERER_KILLED_BY_USER || error == Type.OK - || error == Type.RENDERER_KILLED_BY_USER_OVER_TIME || error == Error.Type.RENDERER_KILLED_BY_SERVER || error == Type.MISSING_SCENE)) { - // do nothing, we can ask for a job right away - } - else { - try { - Thread.sleep(300000); // sleeping for 5min - } - catch (InterruptedException e) { - } - } } /**