From d364603e4550faa77b295a0142d765b080d1f51f Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Wed, 22 Nov 2017 20:02:31 +0900 Subject: [PATCH] Make registry checking work again --- osu-framework | 2 +- osu.Desktop/OsuGameDesktop.cs | 9 --------- osu.Desktop/osu.Desktop.csproj | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/osu-framework b/osu-framework index f6926e465d..a4cbd332c4 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f6926e465dfecc99f7b11013c7e2428b736bfea2 +Subproject commit a4cbd332c4fcdd682252f5a89d8c01052b405e86 diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index d356fcf53d..f2906f043c 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -10,10 +10,7 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Platform; using osu.Game; using OpenTK.Input; - -#if NET_FRAMEWORK using Microsoft.Win32; -#endif namespace osu.Desktop { @@ -48,7 +45,6 @@ namespace osu.Desktop { Func checkExists = p => Directory.Exists(Path.Combine(p, "Songs")); -#if NET_FRAMEWORK string stableInstallPath; try @@ -62,13 +58,8 @@ namespace osu.Desktop catch { } -#endif -#if NET_FRAMEWORK stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!"); -#else - var stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!"); -#endif if (checkExists(stableInstallPath)) return stableInstallPath; diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 56a455e6b7..a8f1a86a7a 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -26,6 +26,7 @@ +