From 98c806efa68fef9cf2d7904bfbcf029fa2e2bd99 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Mon, 1 Aug 2016 00:47:29 +0200 Subject: [PATCH] Bugfix: NullPointerException --- .../client/standalone/swing/activity/Working.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/sheepit/client/standalone/swing/activity/Working.java b/src/com/sheepit/client/standalone/swing/activity/Working.java index 6c4ac94..ca4de9e 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Working.java +++ b/src/com/sheepit/client/standalone/swing/activity/Working.java @@ -13,6 +13,8 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; import com.sheepit.client.Client; +import com.sheepit.client.Job; +import com.sheepit.client.RenderProcess; import com.sheepit.client.Server; import com.sheepit.client.os.OS; import com.sheepit.client.standalone.GuiSwing; @@ -248,9 +250,15 @@ public class Working implements Activity { public void actionPerformed(ActionEvent e) { Client client = parent.getClient(); if (client != null) { - client.getRenderingJob().setAskForRendererKill(true); - client.getRenderingJob().setUserBlockJob(true); - OS.getOS().kill(client.getRenderingJob().getProcessRender().getProcess()); + Job job = client.getRenderingJob(); + if (job != null) { + job.setAskForRendererKill(true); + job.setUserBlockJob(true); + RenderProcess process = job.getProcessRender(); + if (process != null) { + OS.getOS().kill(process.getProcess()); + } + } } } }