From d8b83ce52bf4f57c9c9db19e7838dc1126008980 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Fri, 24 Jul 2020 13:22:21 -0400
Subject: [PATCH] clientui: reset frame position in safe mode

---
 .../src/main/java/net/runelite/client/ui/ClientUI.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
index 13c13c7c68..aac0c62bc9 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
@@ -48,6 +48,7 @@ import java.awt.image.BufferedImage;
 import java.time.Duration;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.swing.BoxLayout;
@@ -122,6 +123,7 @@ public class ClientUI
 	private final ConfigManager configManager;
 	private final Provider<ClientThread> clientThreadProvider;
 	private final EventBus eventBus;
+	private final boolean safeMode;
 
 	private final CardLayout cardLayout = new CardLayout();
 	private final Rectangle sidebarButtonPosition = new Rectangle();
@@ -150,7 +152,8 @@ public class ClientUI
 		@Nullable Applet client,
 		ConfigManager configManager,
 		Provider<ClientThread> clientThreadProvider,
-		EventBus eventBus)
+		EventBus eventBus,
+		@Named("safeMode") boolean safeMode)
 	{
 		this.config = config;
 		this.keyManager = keyManager;
@@ -159,6 +162,7 @@ public class ClientUI
 		this.configManager = configManager;
 		this.clientThreadProvider = clientThreadProvider;
 		this.eventBus = eventBus;
+		this.safeMode = safeMode;
 	}
 
 	@Subscribe
@@ -507,7 +511,7 @@ public class ClientUI
 			trayIcon = SwingUtil.createTrayIcon(ICON, RuneLiteProperties.getTitle(), frame);
 
 			// Move frame around (needs to be done after frame is packed)
-			if (config.rememberScreenBounds())
+			if (config.rememberScreenBounds() && !safeMode)
 			{
 				try
 				{