From 51f14ed21a08d549f84038d02689401735b3fae4 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Jul 2017 11:13:33 +0900 Subject: [PATCH 1/2] Update resources --- osu-resources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-resources b/osu-resources index 900f47563f..76656c51f2 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 900f47563f5598eef7cbf203f0b3f2166508b6d5 +Subproject commit 76656c51f281e7934159e9ed4414378fef24d130 From 96189fa749d7c2361b77bb5eb01a3e664d4f1d2f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Jul 2017 16:16:49 +0900 Subject: [PATCH 2/2] Fix crash on startup for release builds --- osu.Desktop/OsuGameDesktop.cs | 13 +++++++++---- osu.Desktop/Overlays/VersionManager.cs | 6 ------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index 299f64d998..51145b42c8 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -11,6 +11,7 @@ using System.Reflection; using System.Drawing; using System.IO; using System.Threading.Tasks; +using osu.Framework.Graphics.Containers; using osu.Game.Screens.Menu; namespace osu.Desktop @@ -22,18 +23,22 @@ namespace osu.Desktop public OsuGameDesktop(string[] args = null) : base(args) { - versionManager = new VersionManager { Depth = int.MinValue }; + versionManager = new VersionManager + { + Depth = int.MinValue, + State = Visibility.Hidden + }; } protected override void LoadComplete() { base.LoadComplete(); - LoadComponentAsync(versionManager); + LoadComponentAsync(versionManager, Add); ScreenChanged += s => { - if (!versionManager.IsAlive && s is Intro) - Add(versionManager); + if (!versionManager.IsPresent && s is Intro) + versionManager.State = Visibility.Visible; }; } diff --git a/osu.Desktop/Overlays/VersionManager.cs b/osu.Desktop/Overlays/VersionManager.cs index b53c4ab3d4..9182f925e1 100644 --- a/osu.Desktop/Overlays/VersionManager.cs +++ b/osu.Desktop/Overlays/VersionManager.cs @@ -93,12 +93,6 @@ namespace osu.Desktop.Overlays checkForUpdateAsync(); } - protected override void LoadComplete() - { - base.LoadComplete(); - State = Visibility.Visible; - } - protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing);