completely disable loading bar when loadingbar=false is set in the properties

Mumfrey
1 parent 0096b127
Showing 2 changed files with 7 additions and 1 deletions
java/common/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/common/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
@@ -311,12 +311,13 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	@Override
 	public void preBeginGame()
 	{
-		LoadingProgress.setEnabled(this.getAndStoreBooleanProperty(LoaderProperties.OPTION_LOADING_BAR, true));
 		LiteAPI api = this.getAPIProvider().getAPI("liteloader");
 		if (api instanceof LiteLoaderCoreAPI)
 		{
 			((LiteLoaderCoreAPI)api).getObjectFactory().preBeginGame();
 		}
+
+		LoadingProgress.setEnabled(this.getAndStoreBooleanProperty(LoaderProperties.OPTION_LOADING_BAR, true));
 	}
 	/* (non-Javadoc)
@@ -325,6 +325,11 @@ public class LiteLoaderTweaker implements ITweaker
 	 */
 	private void onPreBeginGame()
 	{
+		if (StartupState.BEGINGAME.isCompleted())
+		{
+			return;
+		}
+		
 		StartupState.BEGINGAME.gotoState();
 		try
 		{