RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply review suggestions.

This commit is contained in:
Lucas A 2019-06-09 20:01:19 +02:00
parent a2bc5b538e
commit 4f6978f2aa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/Screens/OsuScreen.cs
View File

@ -64,17 +64,17 @@ public abstract class OsuScreen : Screen, IOsuScreen, IKeyBindingHandler<GlobalA
/// </summary>
protected UserActivity ScreenActivity
{
get => activity;
get => screenActivity;
set
{
if (value == activity) return;
if (value == screenActivity) return;
activity = value;
setUserActivity(activity);
screenActivity = value;
setUserActivity(screenActivity);
}
}
private UserActivity activity;
private UserActivity screenActivity;
/// <summary>
/// Whether to disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children).
@ -122,11 +122,11 @@ protected OsuScreen()
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
activity = null;
screenActivity = null;
}
[BackgroundDependencyLoader(true)]
private void load(OsuGame osu, AudioManager audio, IAPIProvider provider)
private void load(OsuGame osu, AudioManager audio)
{
sampleExit = audio.Samples.Get(@"UI/screen-back");
}
@ -152,7 +152,7 @@ public override void OnResuming(IScreen last)
sampleExit?.Play();
applyArrivingDefaults(true);
setUserActivity(activity);
setUserActivity(screenActivity);
base.OnResuming(last);
}