Merge branch 'master' into net5.0

This commit is contained in:
Dean Herbert
2020-12-10 17:14:21 +09:00
committed by GitHub
385 changed files with 6565 additions and 3268 deletions

View File

@ -60,6 +60,7 @@ namespace osu.Desktop
if (OperatingSystem.IsWindows())
{
stableInstallPath = getStableInstallPathFromRegistry();
if (checkExists(stableInstallPath))
return stableInstallPath;
}
@ -141,7 +142,7 @@ namespace osu.Desktop
break;
// SDL2 DesktopWindow
case DesktopWindow desktopWindow:
case SDL2DesktopWindow desktopWindow:
desktopWindow.CursorState |= CursorState.Hidden;
desktopWindow.SetIconFromStream(iconStream);
desktopWindow.Title = Name;