From 6c74998487166c9723e191a33c74f97dfe36164a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 11 Jun 2019 19:24:36 +0200
Subject: [PATCH] Set ScreenActivity to InitialScreenActivity only when
 ScreenActivity hasn't been set manually before.

---
 osu.Game/Screens/OsuScreen.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 3b5e0fd0d6..582f97d46a 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -56,9 +56,13 @@ namespace osu.Game.Screens
 
         /// <summary>
         /// The <see cref="UserActivity"/> to set the user's activity automatically to when this screen is entered
+        /// <para>This <see cref="ScreenActivity"/> will be automatically set to <see cref="InitialScreenActivity"/> for this screen on entering unless
+        /// <see cref="ScreenActivity"/> is manually set before.</para>
         /// </summary>
         protected virtual UserActivity InitialScreenActivity => null;
 
+        private UserActivity screenActivity;
+
         /// <summary>
         /// The <see cref="UserActivity"/> for this screen.
         /// </summary>
@@ -74,8 +78,6 @@ namespace osu.Game.Screens
             }
         }
 
-        private UserActivity screenActivity;
-
         /// <summary>
         /// Whether to disallow changes to game-wise Beatmap/Ruleset bindables for this screen (and all children).
         /// </summary>
@@ -170,7 +172,8 @@ namespace osu.Game.Screens
 
             backgroundStack?.Push(localBackground = CreateBackground());
 
-            ScreenActivity = InitialScreenActivity;
+            if (screenActivity == null)
+                ScreenActivity = InitialScreenActivity;
 
             base.OnEntering(last);
         }