From 3649ef508c9a20eeac06a040dbea6691801ebcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Fri, 26 Oct 2018 23:50:33 +0200
Subject: [PATCH] Code de-duplication

---
 DerpingDrivers/MainWindow.xaml.cs | 42 ++++++++++++++-----------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/DerpingDrivers/MainWindow.xaml.cs b/DerpingDrivers/MainWindow.xaml.cs
index 1dc2fc5..9056855 100644
--- 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