From d3530312fb83f039b72df09daf1b4da8d0c010e9 Mon Sep 17 00:00:00 2001
From: Kevin Turner <83819+keturn@users.noreply.github.com>
Date: Sat, 10 Apr 2021 09:00:46 -0700
Subject: [PATCH] fix(DiscordRPC): null check in preShutdown

This can happen when there is a crash leading to shutdown before everything is set up.
---
 .../subsystem/discordrpc/DiscordRPCSubSystem.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
index a8a4914bfd..0e4331471d 100644
--- a/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
+++ b/subsystems/DiscordRPC/src/main/java/org/terasology/subsystem/discordrpc/DiscordRPCSubSystem.java
@@ -132,8 +132,10 @@ public synchronized void postInitialise(Context context) {
 
     @Override
     public synchronized void preShutdown() {
-        thread.disable();
-        thread.stop();
+        if (thread != null) {
+            thread.disable();
+            thread.stop();
+        }
     }
 
     @Override