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

Fix potential crash during stable install migration due to multiple configuration files

Browse Source 
Apparently this can be a thing on windows.

Closes https://github.com/ppy/osu/discussions/16689.
This commit is contained in:
Dean Herbert 2022-01-29 13:27:19 +09:00
parent 8883505eed
commit b2ebcabdd5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/IO/StableStorage.cs
View File

@ -34,11 +34,17 @@ namespace osu.Game.IO
private string locateSongsDirectory() private string locateSongsDirectory()
{ {
string configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault(); var configurationFiles = GetFiles(".", $"osu!.{Environment.UserName}.cfg");
if (configFile != null) // GetFiles returns case insensitive results, so multiple files could exist.
// Prefer a case-correct match, but fallback to any available.
string usableConfigFile =
configurationFiles.FirstOrDefault(f => f.Contains(Environment.UserName, StringComparison.Ordinal))
?? configurationFiles.FirstOrDefault();
if (usableConfigFile != null)
{ {
using (var stream = GetStream(configFile)) using (var stream = GetStream(usableConfigFile))
using (var textReader = new StreamReader(stream)) using (var textReader = new StreamReader(stream))
{ {
string line; string line;