interfacestyles: Run on game thread (runelite#3129)

To prevent conflicts with game thread, move all client related logic to game thread
KerZam · May 23, 2018 · 78b6a5b · 78b6a5b
1 parent abc8028
commit 78b6a5b
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/...ient/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/...ient/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
@@ -44,6 +44,7 @@
 import net.runelite.api.events.WidgetPositioned;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.game.SpriteManager;
 import net.runelite.client.plugins.Plugin;
@@ -59,6 +60,9 @@ public class InterfaceStylesPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private ClientThread clientThread;
+
 	@Inject
 	private InterfaceStylesConfig config;
 
@@ -74,29 +78,38 @@ InterfaceStylesConfig provideConfig(ConfigManager configManager)
 	@Override
 	protected void startUp() throws Exception
 	{
-		overrideSprites();
-		overrideWidgetSprites();
-		restoreWidgetDimensions();
-		adjustWidgetDimensions();
+		clientThread.invokeLater(() ->
+		{
+			overrideSprites();
+			overrideWidgetSprites();
+			restoreWidgetDimensions();
+			adjustWidgetDimensions();
+		});
 	}
 
 	@Override
 	protected void shutDown() throws Exception
 	{
-		restoreWidgetDimensions();
-		removeGameframe();
+		clientThread.invokeLater(() ->
+		{
+			restoreWidgetDimensions();
+			removeGameframe();
+		});
 	}
 
 	@Subscribe
 	public void onConfigChanged(ConfigChanged config)
 	{
 		if (config.getGroup().equals("interfaceStyles"))
 		{
-			removeGameframe();
-			overrideSprites();
-			overrideWidgetSprites();
-			restoreWidgetDimensions();
-			adjustWidgetDimensions();
+			clientThread.invokeLater(() ->
+			{
+				removeGameframe();
+				overrideSprites();
+				overrideWidgetSprites();
+				restoreWidgetDimensions();
+				adjustWidgetDimensions();
+			});
 		}
 	}