h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 10:23:03 +08:00
Code Issues Releases Wiki Activity

Make registry checking work again

Browse Source
This commit is contained in:
smoogipoo 2017-11-22 20:02:31 +09:00
parent 05aa6faf5e
commit d364603e45
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit f6926e465dfecc99f7b11013c7e2428b736bfea2 Subproject commit a4cbd332c4fcdd682252f5a89d8c01052b405e86

9
osu.Desktop/OsuGameDesktop.cs
View File

@ -10,10 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game; using osu.Game;
using OpenTK.Input; using OpenTK.Input;
#if NET_FRAMEWORK
using Microsoft.Win32; using Microsoft.Win32;
#endif
namespace osu.Desktop namespace osu.Desktop
{ {
@ -48,7 +45,6 @@ namespace osu.Desktop
{ {
Func<string, bool> checkExists = p => Directory.Exists(Path.Combine(p, "Songs")); Func<string, bool> checkExists = p => Directory.Exists(Path.Combine(p, "Songs"));
#if NET_FRAMEWORK
string stableInstallPath; string stableInstallPath;
try try
@ -62,13 +58,8 @@ namespace osu.Desktop
catch catch
{ {
} }
#endif
#if NET_FRAMEWORK
stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!"); stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
#else
var stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
#endif
if (checkExists(stableInstallPath)) if (checkExists(stableInstallPath))
return stableInstallPath; return stableInstallPath;

1
osu.Desktop/osu.Desktop.csproj
View File

@ -26,6 +26,7 @@
<ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" /> <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
<ProjectReference Include="..\osu.Game\osu.Game.csproj" /> <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
<ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" /> <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Package References"> <ItemGroup Label="Package References">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />