sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move AdminChecker to osu.Desktop.Admin

Browse Source
This commit is contained in:
Christine Chen
2021-04-26 17:41:04 -04:00
parent 9ad30da729
commit 260dd06f47
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Desktop/OsuGameDesktop.cs
View File

@ -7,9 +7,9 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Versioning;
using System.Security.Principal;
using System.Threading.Tasks;
using Microsoft.Win32;
using osu.Desktop.Admin;
using osu.Desktop.Overlays;
using osu.Framework.Platform;
using osu.Game;
@ -21,7 +21,6 @@ using osu.Game.Screens.Menu;
using osu.Game.Updater;
using osu.Desktop.Windows;
using osu.Framework.Threading;
using osu.Game.Admin;
using osu.Game.IO;
namespace osu.Desktop
@ -104,8 +103,6 @@ namespace osu.Desktop
}
}
protected override AdminChecker CreateAdminChecker() => new DesktopAdminChecker();
protected override void LoadComplete()
{
base.LoadComplete();
@ -117,6 +114,8 @@ namespace osu.Desktop
if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
LoadComponentAsync(new GameplayWinKeyBlocker(), Add);
LoadComponentAsync(new AdminChecker(), Add);
}
protected override void ScreenChanged(IScreen lastScreen, IScreen newScreen)
@ -184,10 +183,5 @@ namespace osu.Desktop
Task.Factory.StartNew(() => Import(paths), TaskCreationOptions.LongRunning);
}
}
private class DesktopAdminChecker : AdminChecker
{
protected override bool IsAdmin() => OperatingSystem.IsWindows() ? new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator) : Mono.Unix.Native.Syscall.geteuid() == 0;
}
}
}