ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Null-check GL and window on plugin shutdown

Browse Source 
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>
This commit is contained in:
Tomas Slusny
2018-11-20 10:02:38 +01:00
parent 2a80df7c3b
commit 59abc86ed2
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
View File

@@ -319,6 +319,11 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
protected void shutDown()
{
clientThread.invoke(() ->
{
client.setGpu(false);
client.setDrawCallbacks(null);
if (gl != null)
{
if (textureArrayId != -1)
{
@@ -326,9 +331,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
textureArrayId = -1;
}
client.setGpu(false);
client.setDrawCallbacks(null);
if (bufferId != -1)
{
GLUtil.glDeleteBuffer(gl, bufferId);
@@ -357,7 +359,12 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
}
glContext.destroy();
}
if (jawtWindow != null)
{
NewtFactoryAWT.destroyNativeWindow(jawtWindow);
}
jawtWindow = null;
gl = null;