Code de-duplication

2018-10-26 23:50:33 +02:00 · 2018-10-26 23:50:33 +02:00 · 3649ef508c
commit 3649ef508c
parent 19e42418cd
1 changed files with 19 additions and 23 deletions
--- a/DerpingDrivers/MainWindow.xaml.cs
+++ b/DerpingDrivers/MainWindow.xaml.cs
@ -79,32 +79,28 @@ namespace DerpingDrivers
                #region Windows 10, x64

                if (OsVersionInfo.IsWindows10
-                    && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64
-                    && UEFIHelper.IsRunningInUEFIMode
-                    && !UEFIHelper.IsSecureBootEnabled
-                    && !OsUpgradeDetection.IsGrandfathered)
-                    return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_clean);
+                    && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64)
+                {
+                    if (UEFIHelper.IsRunningInUEFIMode
+                        && !UEFIHelper.IsSecureBootEnabled
+                        && !OsUpgradeDetection.IsGrandfathered)
+                        return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_clean);

-                if (OsVersionInfo.IsWindows10
-                    && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64
-                    && UEFIHelper.IsRunningInUEFIMode
-                    && UEFIHelper.IsSecureBootEnabled
-                    && !OsUpgradeDetection.IsGrandfathered)
-                    return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_clean);
+                    if (UEFIHelper.IsRunningInUEFIMode
+                        && UEFIHelper.IsSecureBootEnabled
+                        && !OsUpgradeDetection.IsGrandfathered)
+                        return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_clean);

-                if (OsVersionInfo.IsWindows10
-                    && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64
-                    && UEFIHelper.IsRunningInUEFIMode
-                    && UEFIHelper.IsSecureBootEnabled
-                    && OsUpgradeDetection.IsGrandfathered)
-                    return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_upgraded);
+                    if (UEFIHelper.IsRunningInUEFIMode
+                        && UEFIHelper.IsSecureBootEnabled
+                        && OsUpgradeDetection.IsGrandfathered)
+                        return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_secure_upgraded);

-                if (OsVersionInfo.IsWindows10
-                    && OsVersionInfo.OsBits == OsVersionInfo.SoftwareArchitecture.Bit64
-                    && UEFIHelper.IsRunningInUEFIMode
-                    && !UEFIHelper.IsSecureBootEnabled
-                    && OsUpgradeDetection.IsGrandfathered)
-                    return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_upgraded);
+                    if (UEFIHelper.IsRunningInUEFIMode
+                        && !UEFIHelper.IsSecureBootEnabled
+                        && OsUpgradeDetection.IsGrandfathered)
+                        return Encoding.UTF8.GetString(Properties.Resources.win10_x64_uefi_upgraded);
+                }

                #endregion