Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spectator mode not showing when a spectated user quits correctly #25548

Closed
wants to merge 11 commits into from

Conversation

peppy
Copy link
Member

@peppy peppy commented Nov 23, 2023

This PR switches SoloSpectatorScreen to use a nested screen for gameplay.

Spectator relies on the SpectatorScreen (which importantly, is not the SpectatorPlayer but a separate screen) to be alive and present in order to function correctly, due to Scheduled operations).

This was already true for multiplayer but not for solo play, so it seems logical to standardise things here.

Closes #25535.


CleanShot.2023-11-23.at.03.38.06.mp4

osu.Game/Screens/Play/SoloSpectatorScreen.cs Outdated Show resolved Hide resolved
@@ -33,7 +33,7 @@ public abstract partial class SpectatorClient : Component, ISpectatorClient
/// Whether the <see cref="SpectatorClient"/> is currently connected.
/// This is NOT thread safe and usage should be scheduled.
/// </summary>
public abstract IBindable<bool> IsConnected { get; }
protected abstract IBindable<bool> IsConnected { get; }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason for encapsulating this? I rely on this being public in #25522.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason, just wasn't being used.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I can just re-expose it again in mine when resolving merge conflicts.

@bdach
Copy link
Collaborator

bdach commented Nov 23, 2023

Transition on retry is a tad broken:

2023-11-23.17-42-46.mp4

osu! logo should not be hanging around like that there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Quitting map leaves spectator in gameplay screen
2 participants