h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 16:27:26 +08:00
Code Issues Releases Wiki Activity

Reword ImportFromStablePopup and display the popup regardless of whether a stable install is detected.

Browse Source
This commit is contained in:
Lucas A 2021-05-09 21:29:41 +02:00
parent 8ba50b1854
commit a7b740fd1d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Database/StableImportManager.cs
View File

@ -87,7 +87,7 @@ namespace osu.Game.Database
return cachedStorage;
var taskCompletionSource = new TaskCompletionSource<string>(TaskCreationOptions.RunContinuationsAsynchronously);
dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource));
Schedule(() => dialogOverlay.Push(new StableDirectoryLocationDialog(taskCompletionSource)));
var stablePath = await taskCompletionSource.Task.ConfigureAwait(false);
return cachedStorage = new StableStorage(stablePath, desktopGameHost);

2
osu.Game/Screens/Select/ImportFromStablePopup.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Screens.Select
public ImportFromStablePopup(Action importFromStable)
{
HeaderText = @"You have no beatmaps!";
BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
BodyText = "You can import files from over a stable install, though.\nWould you like to import your beatmaps, skins, collections and scores?\nThis will create a second copy of all files on disk.";
Icon = FontAwesome.Solid.Plane;

4
osu.Game/Screens/Select/SongSelect.cs
View File

@ -281,8 +281,8 @@ namespace osu.Game.Screens.Select
{
Schedule(() =>
{
// if we have no beatmaps but osu-stable is found, let's prompt the user to import.
if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && beatmaps.StableInstallationAvailable)
// if we have no beatmaps, let's prompt the user to import from over a stable install if he has one.
if (!beatmaps.GetAllUsableBeatmapSetsEnumerable(IncludedDetails.Minimal).Any() && stableImportManager.SupportsImportFromStable)
{
dialogOverlay.Push(new ImportFromStablePopup(() =>
{