Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SharpModMenu/PlayerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal static class PlayerExtensions
{
public static ObserverInfo GetObserverInfo(this CCSPlayerController player)
{
if (player.Pawn.Value is not CBasePlayerPawn pawn)
if (!player.Pawn.IsValid || player.Pawn.Value is not CBasePlayerPawn pawn)
return new() { Mode = ObserverMode.Roaming, Observing = null };

if (pawn.ObserverServices is not CPlayer_ObserverServices observerServices)
Expand Down
1 change: 1 addition & 0 deletions src/SharpModMenu/PlayerMenuState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public void Refresh(bool sortPriorities = true)
public void Dispose()
{
DestroyEntities();
MenuActive = false; // force the removal of this menu from the active menus
}

private CPointWorldText? HighlightText { get; set; }
Expand Down
Loading