From 39bd52aca47a1fb4801c463d616d069837fff565 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Tue, 4 Apr 2017 22:56:53 +0200 Subject: [PATCH] Bugfix: check if max ram is set before using it --- src/com/sheepit/client/Job.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java index d200ae0..72edeea 100644 --- a/src/com/sheepit/client/Job.java +++ b/src/com/sheepit/client/Job.java @@ -313,7 +313,7 @@ public class Job { log.debug(line); updateRenderingMemoryPeak(line); - if (process.getMemoryUsed() > config.getMaxMemory()) { + if (config.getMaxMemory() != -1 && process.getMemoryUsed() > config.getMaxMemory()) { log.debug("Blocking render because process ram used (" + process.getMemoryUsed() + "k) is over user setting (" + config.getMaxMemory() + "k)"); process.finish(); if (script_file != null) {