h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into remove-debug-utils

Browse Source
This commit is contained in:
Dan Balasescu 2019-06-21 11:10:59 +09:00 committed by GitHub
commit 4d02e17539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -363,7 +363,7 @@ namespace osu.Game.Beatmaps
foreach (var name in reader.Filenames.Where(f => f.EndsWith(".osu"))) foreach (var name in reader.Filenames.Where(f => f.EndsWith(".osu")))
{ {
using (var raw = reader.GetStream(name)) using (var raw = reader.GetStream(name))
using (var ms = new MemoryStream()) //we need a memory stream so we can seek and shit using (var ms = new MemoryStream()) //we need a memory stream so we can seek
using (var sr = new StreamReader(ms)) using (var sr = new StreamReader(ms))
{ {
raw.CopyTo(ms); raw.CopyTo(ms);

2
osu.Game/Screens/Menu/Intro.cs
View File

@ -165,7 +165,7 @@ namespace osu.Game.Screens.Menu
Scheduler.AddDelayed(this.Exit, fadeOutTime); Scheduler.AddDelayed(this.Exit, fadeOutTime);
//don't want to fade out completely else we will stop running updates and shit will hit the fan. //don't want to fade out completely else we will stop running updates.
Game.FadeTo(0.01f, fadeOutTime); Game.FadeTo(0.01f, fadeOutTime);
base.OnResuming(last); base.OnResuming(last);