From 5b777c3bb5b33cc98618dfa19b8a0b440c2d3159 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 14 May 2018 10:23:48 -0700
Subject: [PATCH] Combine IBM PC-CD options, fix "no copy protection"

Previously, the "No Copy Protection" variant was using the wrong "type" of dumping. This would have caused issues in the long run. This change also consolidates all of the variants previously used for IBM PC into a single option that can accurately capture all of the previous ones. This will reduce new user confusion about what choice to make given a disc.
---
 MainWindow.xaml    |  7 ++-----
 MainWindow.xaml.cs | 17 ++---------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 291542e0..db7bcdd7 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -66,11 +66,8 @@
                 <ComboBoxItem Content="Apple Macintosh (CD-Rom)"/>
                 <ComboBoxItem Content="Apple Macintosh (DVD-Rom)"/>
                 <ComboBoxItem Content="Fujitsu FM Towns series"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) No Copy Protection"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) SecuROM"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) Detectable Protection"/>
-                <ComboBoxItem Content="IBM PC Compatible (CD-Rom) C2 Error Protection"/>
-                <ComboBoxItem Content="IBM PC Compatible (DVD-Rom)"/>
+				<ComboBoxItem Content="IBM PC Compatible (CD-Rom)"/>
+				<ComboBoxItem Content="IBM PC Compatible (DVD-Rom)"/>
                 <ComboBoxItem Content="NEC PC-88"/>
                 <ComboBoxItem Content="NEC PC-98"/>
                 <ComboBoxItem Content="---------- Arcade ----------" IsEnabled="False"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 879c979a..c9b5ae73 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -188,22 +188,9 @@ namespace DICUI
                     VAR_Type = "cd";
                     VAR_Switches = "/c2";
                     break;
-                // TODO: Can protection be determined by a check automatically?
-                case "IBM PC Compatible (CD-Rom) No Copy Protection":
-                    VAR_Type = "dvd";
-                    VAR_Switches = "/c2";
-                    break;
-                case "IBM PC Compatible (CD-Rom) SecuROM":
+                case "IBM PC Compatible (CD-Rom)":
                     VAR_Type = "cd";
-                    VAR_Switches = "/c2 /ns";
-                    break;
-                case "IBM PC Compatible (CD-Rom) Detectable Protection":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2 /sf";
-                    break;
-                case "IBM PC Compatible (CD-Rom) C2 Error Protection":
-                    VAR_Type = "cd";
-                    VAR_Switches = "/c2 /ss";
+                    VAR_Switches = "/c2 /ns /sf /ss";
                     break;
                 case "IBM PC Compatible (DVD-Rom)":
                     VAR_Type = "dvd";