From 8cc40595259b75a7d4aadc2ca733b6c40adcc499 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 3 Aug 2018 16:09:08 -0400 Subject: [PATCH] Fix applying default config to session settings cda98f moved the plugin manager to not be registered on the eventbus until after the session was opened. The session config was relying on the plugin manager applying the default config based on the session open event. This moves session loading to be prior to applying the default config, so newly added config options get properly set at startup. Fixes config panel breaking which expects the config to always have non-null values for config items with defaults. Co-authored-by: Tomas Slusny --- .../src/main/java/net/runelite/client/RuneLite.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 9f164f104e..ee88ab1909 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -241,6 +241,9 @@ public class RuneLite // Load user configuration configManager.load(); + // Load the session, including saved configuration + sessionManager.loadSession(); + // Tell the plugin manager if client is outdated or not pluginManager.setOutdated(isOutdated); @@ -255,9 +258,6 @@ public class RuneLite // Start client session clientSessionManager.start(); - // Load the session, including saved configuration - sessionManager.loadSession(); - // Initialize UI clientUI.open(this);