From 997c6f45f62473faaa3bfb7a711ca6ac4f96bc9c Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 21 Sep 2016 17:37:33 +0900 Subject: [PATCH] Update framework again. --- osu-framework | 2 +- osu.Game/GameModes/Menu/ButtonSystem.cs | 10 ++++++---- osu.Game/Online/API/OAuth.cs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/osu-framework b/osu-framework index 0ca3fe2b5d..6357711a41 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3 +Subproject commit 6357711a41aaaeecfb8a60c09c5d5cc3c01d1778 diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 75fec4bdbf..24ccba839a 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -298,14 +298,16 @@ namespace osu.Game.GameModes.Menu { Children = new Drawable[] { - logo = new Sprite(Game.Textures.Get(@"menu-osu")) + logo = new Sprite() { - Anchor = Anchor.Centre, + Texture = Game.Textures.Get(@"menu-osu"), + Anchor = Anchor.Centre, Origin = Anchor.Centre }, - ripple = new Sprite(Game.Textures.Get(@"menu-osu")) + ripple = new Sprite() { - Anchor = Anchor.Centre, + Texture = Game.Textures.Get(@"menu-osu"), + Anchor = Anchor.Centre, Origin = Anchor.Centre, Alpha = 0.4f }, diff --git a/osu.Game/Online/API/OAuth.cs b/osu.Game/Online/API/OAuth.cs index bbd33c0b95..3358fac0e8 100644 --- a/osu.Game/Online/API/OAuth.cs +++ b/osu.Game/Online/API/OAuth.cs @@ -65,7 +65,7 @@ namespace osu.Game.Online.API Token = req.ResponseObject; return true; } - catch (Exception e) + catch { //todo: potentially only kill the refresh token on certain exception types. Token = null;