Fix UpdateMusic NRE

solwllms · handsomematt · commit 1cb6485cfe59 · 2026-04-08T18:07:36.000+01:00
diff --git a/game/addons/menu/Code/MenuSystem.cs b/game/addons/menu/Code/MenuSystem.cs
@@ -151,7 +151,7 @@ public void Update()
 
 	void UpdateMusic()
 	{
-		bool isAvatarMenu = Game.ActiveScene.Get<AvatarEditManager>() != null;
+		bool isAvatarMenu = Game.ActiveScene?.Get<AvatarEditManager>() != null;
 		bool isLoadingScreen = LoadingScreen.IsVisible;
 
 		menu.Enabled = false; // Game.IsMainMenuVisible && !isLoadingScreen && !isAvatarMenu;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public void Update()`
`151`	`151`
`152`	`152`	`void UpdateMusic()`
`153`	`153`	`{`
`154`		`- bool isAvatarMenu = Game.ActiveScene.Get<AvatarEditManager>() != null;`
	`154`	`+ bool isAvatarMenu = Game.ActiveScene?.Get<AvatarEditManager>() != null;`
`155`	`155`	`bool isLoadingScreen = LoadingScreen.IsVisible;`
`156`	`156`
`157`	`157`	`menu.Enabled = false; // Game.IsMainMenuVisible && !isLoadingScreen && !isAvatarMenu;`