don't need to complain when I can do this

This reverts commit 02a70a4457.
This commit is contained in:
zeromus 2020-05-25 23:15:25 -05:00
parent 6e9539157e
commit 162a151451
1 changed files with 4 additions and 7 deletions

View File

@ -26,7 +26,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawkLink;
using BizHawk.Client.EmuHawk.ToolExtensions;
using BizHawk.Client.EmuHawk.CoreExtensions;
using BizHawk.Client.EmuHawk.CustomControls;
using BizHawk.Common.PathExtensions;
using BizHawk.Emulation.Common.Base_Implementations;
using BizHawk.Emulation.Cores.Nintendo.SNES9X;
@ -487,7 +486,7 @@ namespace BizHawk.Client.EmuHawk
// I would like to trigger a repaint here, but this isn't done yet
};
if (!VersionInfo.DeveloperBuild && !OSTailoredCode.IsUnixHost && !Config.SkipOutdatedOsCheck)
if (!OSTailoredCode.IsUnixHost && !Config.SkipOutdatedOsCheck)
{
static string GetRegValue(string key)
{
@ -499,16 +498,14 @@ namespace BizHawk.Client.EmuHawk
if (winVer < 6.3f)
{
// less than is just easier than equals
using var box = new ExceptionBox($"Quick reminder: Windows {(winVer < 6.2f ? winVer < 6.1f ? winVer < 6.0f ? "XP" : "Vista" : "7" : "8")} is no longer supported by Microsoft. EmuHawk will continue to work, but please get a new operating system for increased security (either Windows 8.1, Windows 10, or a GNU+Linux distro)."); //TODO one day I'll try ReactOS, just like one day I'll add i18n... --yoshi
box.ShowDialog();
string message = ($"Quick reminder: Windows {(winVer < 6.2f ? winVer < 6.1f ? winVer < 6.0f ? "XP" : "Vista" : "7" : "8")} is no longer supported by Microsoft. EmuHawk will continue to work, but please get a new operating system for increased security (either Windows 8.1, Windows 10, or a GNU+Linux distro).");
}
else if (GetRegValue("ProductName").Contains("Windows 10"))
{
var win10version = int.Parse(GetRegValue("ReleaseId"));
if (win10version < 1809) // readme says otherwise, but that's because I updated it before MS extended the support period --yoshi
if (win10version < 1809)
{
using var box = new ExceptionBox($"Quick reminder: version {win10version} of Windows 10 is no longer supported by Microsoft. EmuHawk will continue to work, but please update to at least 1809 \"Redstone 5\" for increased security.");
box.ShowDialog();
string message = ($"Quick reminder: version {win10version} of Windows 10 is no longer supported by Microsoft. EmuHawk will continue to work, but please update to at least 1809 \"Redstone 5\" for increased security.");
}
}
else