Skip to content

Commit c516a1a

Browse files
committed
main menu can now be open when accessing individual user settings
1 parent b76d67d commit c516a1a

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

Basis/Packages/com.basis.framework/UI/NamePlate/BasisRemoteNamePlate.cs

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -273,22 +273,20 @@ public void HighlightObject(bool IsHighlighted)
273273
}
274274
public void WasPressed(BasisInput input)
275275
{
276-
if (BasisRemotePlayer != null && BasisIndividualPlayerSettings.Instance == null)
276+
if (BasisRemotePlayer != null && BasisIndividualPlayerSettings.Instance == null && BasisMainMenu.ActiveMenuTitle != IndividualPlayerProvider.StaticTitle)
277277
{
278-
if (BasisMainMenu.Instance == null)
278+
BasisMainMenu.Close();
279+
input.PlaySoundEffect("hover", SMModuleAudio.ActiveMenusVolume);
280+
IndividualPlayerProvider.remotePlayer = BasisRemotePlayer;
281+
BasisMainMenu.Open();
282+
int count = BasisMainMenu.Providers.Count;
283+
for (int Index = 0; Index < count; Index++)
279284
{
280-
input.PlaySoundEffect("hover", SMModuleAudio.ActiveMenusVolume);
281-
IndividualPlayerProvider.remotePlayer = BasisRemotePlayer;
282-
BasisMainMenu.Open();
283-
int count = BasisMainMenu.Providers.Count;
284-
for (int Index = 0; Index < count; Index++)
285+
BasisMenuActionProvider<BasisMainMenu> provider = BasisMainMenu.Providers[Index];
286+
if (provider.Title == IndividualPlayerProvider.StaticTitle)
285287
{
286-
BasisMenuActionProvider<BasisMainMenu> provider = BasisMainMenu.Providers[Index];
287-
if (provider.Title == IndividualPlayerProvider.StaticTitle)
288-
{
289-
provider.RunAction();
290-
return;
291-
}
288+
provider.RunAction();
289+
return;
292290
}
293291
}
294292
}

0 commit comments

Comments
 (0)