From 59abc86ed2d22bc5a89f6deab190b1d859fb1318 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Tue, 20 Nov 2018 10:02:38 +0100
Subject: [PATCH]  Null-check GL and window on plugin shutdown

 If GL is not even created due to missing library error or unsupported
 version, this throws a lot of unnecessary exceptions to log and fails
 on shutDown resulting in possibly improperly feed objects and displays.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 .../client/plugins/gpu/GpuPlugin.java         | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
index b6fa6d4561..a6f48d13eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
@@ -320,45 +320,52 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 	{
 		clientThread.invoke(() ->
 		{
-			if (textureArrayId != -1)
-			{
-				textureManager.freeTextureArray(gl, textureArrayId);
-				textureArrayId = -1;
-			}
-
 			client.setGpu(false);
 			client.setDrawCallbacks(null);
 
-			if (bufferId != -1)
+			if (gl != null)
 			{
-				GLUtil.glDeleteBuffer(gl, bufferId);
-				bufferId = -1;
+				if (textureArrayId != -1)
+				{
+					textureManager.freeTextureArray(gl, textureArrayId);
+					textureArrayId = -1;
+				}
+
+				if (bufferId != -1)
+				{
+					GLUtil.glDeleteBuffer(gl, bufferId);
+					bufferId = -1;
+				}
+
+				if (uvBufferId != -1)
+				{
+					GLUtil.glDeleteBuffer(gl, uvBufferId);
+					uvBufferId = -1;
+				}
+
+				if (uniformBufferId != -1)
+				{
+					GLUtil.glDeleteBuffer(gl, uniformBufferId);
+					uniformBufferId = -1;
+				}
+
+				shutdownInterfaceTexture();
+				shutdownProgram();
+				shutdownVao();
+
+				if (!jawtWindow.getLock().isLocked())
+				{
+					jawtWindow.lockSurface();
+				}
+
+				glContext.destroy();
 			}
 
-			if (uvBufferId != -1)
+			if (jawtWindow != null)
 			{
-				GLUtil.glDeleteBuffer(gl, uvBufferId);
-				uvBufferId = -1;
+				NewtFactoryAWT.destroyNativeWindow(jawtWindow);
 			}
 
-			if (uniformBufferId != -1)
-			{
-				GLUtil.glDeleteBuffer(gl, uniformBufferId);
-				uniformBufferId = -1;
-			}
-
-			shutdownInterfaceTexture();
-			shutdownProgram();
-			shutdownVao();
-
-			if (!jawtWindow.getLock().isLocked())
-			{
-				jawtWindow.lockSurface();
-			}
-
-			glContext.destroy();
-			NewtFactoryAWT.destroyNativeWindow(jawtWindow);
-
 			jawtWindow = null;
 			gl = null;
 			glDrawable = null;