Qt: Hide apply image patches in game settings

Doesn't makes sense, because game settings are applied after
identification.

src/core/fullscreen_ui.cpp

@@ -4407,7 +4407,8 @@ void FullscreenUI::DrawConsoleSettingsPage()
 
   static constexpr std::array cdrom_read_seek_speed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0};
 
-  SettingsInterface* bsi = GetEditingSettingsInterface();
+  SettingsInterface* const bsi = GetEditingSettingsInterface();
+  const bool game_settings = IsEditingGameSettings(bsi);
 
   BeginMenuButtons();
   ResetFocusHere();
@@ -4492,10 +4493,17 @@ void FullscreenUI::DrawConsoleSettingsPage()
     bsi, FSUI_ICONVSTR(ICON_FA_DOWNLOAD, "Preload Images to RAM"),
     FSUI_VSTR("Loads the game image into RAM. Useful for network paths that may become unreliable during gameplay."),
     "CDROM", "LoadImageToRAM", false);
-  DrawToggleSetting(
+  if (!game_settings)
-    bsi, FSUI_ICONVSTR(ICON_FA_VEST_PATCHES, "Apply Image Patches"),
+  {
-    FSUI_VSTR("Automatically applies patches to disc images when they are present, currently only PPF is supported."),
+    DrawToggleSetting(
-    "CDROM", "LoadImagePatches", false);
+      bsi, FSUI_ICONVSTR(ICON_FA_VEST_PATCHES, "Apply Image Patches"),
+      FSUI_VSTR("Automatically applies patches to disc images when they are present, currently only PPF is supported."),
+      "CDROM", "LoadImagePatches", false);
+    DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_BAN, "Ignore Drive Subcode"),
+                      FSUI_VSTR("Ignores the subchannel provided by the drive when using physical discs, instead "
+                                "always generating subchannel data. Can improve read reliability on some drives."),
+                      "CDROM", "IgnoreHostSubcode", false);
+  }
   DrawToggleSetting(bsi, FSUI_ICONVSTR(ICON_FA_LIST_OL, "Switch to Next Disc on Stop"),
                     FSUI_VSTR("Automatically switches to the next disc in the game when the game stops the CD-ROM "
                               "motor. Does not work for all games."),
@@ -9675,6 +9683,8 @@ TRANSLATE_NOOP("FullscreenUI", "Identifies any new files added to the game direc
 TRANSLATE_NOOP("FullscreenUI", "If enabled, the display will be blended with the transparency of the overlay image.");
 TRANSLATE_NOOP("FullscreenUI", "If enabled, the transparency of the overlay image will be applied.");
 TRANSLATE_NOOP("FullscreenUI", "If not enabled, the current post processing chain will be ignored.");
+TRANSLATE_NOOP("FullscreenUI", "Ignore Drive Subcode");
+TRANSLATE_NOOP("FullscreenUI", "Ignores the subchannel provided by the drive when using physical discs, instead always generating subchannel data. Can improve read reliability on some drives.");
 TRANSLATE_NOOP("FullscreenUI", "Image Path");
 TRANSLATE_NOOP("FullscreenUI", "In the form below, specify the URLs to download covers from, with one template URL per line. The following variables are available:");
 TRANSLATE_NOOP("FullscreenUI", "Includes the elapsed time since the application start in file logs.");

src/duckstation-qt/consolesettingswidget.cpp

@@ -66,18 +66,22 @@ ConsoleSettingsWidget::ConsoleSettingsWidget(SettingsWindow* dialog, QWidget* pa
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableCPUClockSpeedControl, "CPU", "OverclockEnable", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.recompilerICache, "CPU", "RecompilerICache", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.cdromLoadImageToRAM, "CDROM", "LoadImageToRAM", false);
-  SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.cdromLoadImagePatches, "CDROM", "LoadImagePatches", false);
   SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.cdromAutoDiscChange, "CDROM", "AutoDiscChange", false);
 
   if (!m_dialog->isPerGameSettings())
   {
+    SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.cdromLoadImagePatches, "CDROM", "LoadImagePatches", false);
     SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.cdromIgnoreDriveSubcode, "CDROM", "IgnoreHostSubcode",
                                                  false);
   }
   else
   {
-
+    m_ui.cdromGridLayout->removeWidget(m_ui.cdromIgnoreDriveSubcode);
-    m_ui.cdromIgnoreDriveSubcode->setEnabled(false);
+    delete m_ui.cdromIgnoreDriveSubcode;
+    m_ui.cdromIgnoreDriveSubcode = nullptr;
+    m_ui.cdromGridLayout->removeWidget(m_ui.cdromLoadImagePatches);
+    delete m_ui.cdromLoadImagePatches;
+    m_ui.cdromLoadImagePatches = nullptr;
   }
 
   SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.cdromSeekSpeedup, "CDROM", "SeekSpeedup", 1,

src/duckstation-qt/consolesettingswidget.ui

@@ -308,7 +308,7 @@
        </widget>
       </item>
       <item row="2" column="0" colspan="2">
-       <layout class="QGridLayout" name="gridLayout">
+       <layout class="QGridLayout" name="cdromGridLayout">
         <item row="0" column="0">
          <widget class="QCheckBox" name="cdromLoadImageToRAM">
           <property name="text">
@@ -316,13 +316,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QCheckBox" name="cdromLoadImagePatches">
-          <property name="text">
-           <string>Apply Image Patches</string>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="1">
          <widget class="QCheckBox" name="cdromIgnoreDriveSubcode">
           <property name="text">
@@ -331,6 +324,13 @@
          </widget>
         </item>
         <item row="1" column="0">
+         <widget class="QCheckBox" name="cdromLoadImagePatches">
+          <property name="text">
+           <string>Apply Image Patches</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
          <widget class="QCheckBox" name="cdromAutoDiscChange">
           <property name="text">
            <string>Switch to Next Disc on Stop</string>

src/duckstation-qt/settingswindow.cpp

@@ -352,6 +352,9 @@ void SettingsWindow::onClearSettingsClicked()
 
 void SettingsWindow::registerWidgetHelp(QObject* object, QString title, QString recommended_value, QString text)
 {
+  if (!object)
+    return;
+
   // construct rich text with formatted description
   QString full_text;
   full_text += "<table width='100%' cellpadding='0' cellspacing='0'><tr><td><strong>";