Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: NullPointerException

Browse Source
This commit is contained in:
Laurent Clouet
2016-08-01 00:47:29 +02:00
parent 0a4624d880
commit 98c806efa6
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/sheepit/client/standalone/swing/activity/Working.java
View File

@@ -13,6 +13,8 @@ import javax.swing.ImageIcon;
import javax.swing.JButton; import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import com.sheepit.client.Client; import com.sheepit.client.Client;
import com.sheepit.client.Job;
import com.sheepit.client.RenderProcess;
import com.sheepit.client.Server; import com.sheepit.client.Server;
import com.sheepit.client.os.OS; import com.sheepit.client.os.OS;
import com.sheepit.client.standalone.GuiSwing; import com.sheepit.client.standalone.GuiSwing;
@@ -248,9 +250,15 @@ public class Working implements Activity {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Client client = parent.getClient(); Client client = parent.getClient();
if (client != null) { if (client != null) {
client.getRenderingJob().setAskForRendererKill(true); Job job = client.getRenderingJob();
client.getRenderingJob().setUserBlockJob(true); if (job != null) {
OS.getOS().kill(client.getRenderingJob().getProcessRender().getProcess()); job.setAskForRendererKill(true);
job.setUserBlockJob(true);
RenderProcess process = job.getProcessRender();
if (process != null) {
OS.getOS().kill(process.getProcess());
}
}
} }
} }
} }