From 35ee889e5b1b567757632b5bb9dd0b350b5820a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 11 Sep 2021 17:55:11 +0200
Subject: [PATCH] Restore clipboard content after difficulty switch

---
 osu.Game/Screens/Edit/Editor.cs      | 5 ++++-
 osu.Game/Screens/Edit/EditorState.cs | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 502ac7a70f..eba75f4408 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -744,13 +744,16 @@ namespace osu.Game.Screens.Edit
 
         protected void SwitchToDifficulty(BeatmapInfo nextBeatmap) => loader?.ScheduleDifficultySwitch(nextBeatmap, new EditorState
         {
-            Time = clock.CurrentTimeAccurate
+            Time = clock.CurrentTimeAccurate,
+            ClipboardContent = editorBeatmap.BeatmapInfo.RulesetID == nextBeatmap.RulesetID ? clipboard.Value : null
         });
 
         private void restoreState([NotNull] EditorState state)
         {
             if (state.Time != null)
                 clock.Seek(state.Time.Value);
+
+            clipboard.Value = state.ClipboardContent ?? clipboard.Value;
         }
 
         private void cancelExit() => loader?.CancelPendingDifficultySwitch();
diff --git a/osu.Game/Screens/Edit/EditorState.cs b/osu.Game/Screens/Edit/EditorState.cs
index 3aa92f35bc..09cc1184d2 100644
--- a/osu.Game/Screens/Edit/EditorState.cs
+++ b/osu.Game/Screens/Edit/EditorState.cs
@@ -15,5 +15,10 @@ namespace osu.Game.Screens.Edit
         /// The current clock time when a difficulty switch was requested.
         /// </summary>
         public double? Time { get; set; }
+
+        /// <summary>
+        /// The current editor clipboard content at the time when a difficulty switch was requested.
+        /// </summary>
+        public string? ClipboardContent { get; set; }
     }
 }