Add per-game overrides (mainly for compatibility)

src/duckstation-qt/gamepropertiesdialog.cpp

@@ -74,6 +74,11 @@ void GamePropertiesDialog::populate(const GameListEntry* ge)
   }
 
   populateTracksInfo(ge->path);
+
+  m_game_code = ge->code;
+  m_game_title = ge->title;
+  m_game_settings = ge->settings;
+  populateGameSettings();
 }
 
 void GamePropertiesDialog::populateCompatibilityInfo(const std::string& game_code)
@@ -107,6 +112,43 @@ void GamePropertiesDialog::setupAdditionalUi()
       tr(GameList::GetGameListCompatibilityRatingString(static_cast<GameListCompatibilityRating>(i))));
   }
 
+  m_ui.userAspectRatio->addItem(tr("(unchanged)"));
+  for (u32 i = 0; i < static_cast<u32>(DisplayAspectRatio::Count); i++)
+  {
+    m_ui.userAspectRatio->addItem(
+      QString::fromUtf8(Settings::GetDisplayAspectRatioName(static_cast<DisplayAspectRatio>(i))));
+  }
+
+  m_ui.userCropMode->addItem(tr("(unchanged)"));
+  for (u32 i = 0; i < static_cast<u32>(DisplayCropMode::Count); i++)
+  {
+    m_ui.userCropMode->addItem(
+      QString::fromUtf8(Settings::GetDisplayCropModeDisplayName(static_cast<DisplayCropMode>(i))));
+  }
+
+  m_ui.userControllerType1->addItem(tr("(unchanged)"));
+  for (u32 i = 0; i < static_cast<u32>(ControllerType::Count); i++)
+  {
+    m_ui.userControllerType1->addItem(
+      QString::fromUtf8(Settings::GetControllerTypeDisplayName(static_cast<ControllerType>(i))));
+  }
+
+  m_ui.userControllerType2->addItem(tr("(unchanged)"));
+  for (u32 i = 0; i < static_cast<u32>(ControllerType::Count); i++)
+  {
+    m_ui.userControllerType2->addItem(
+      QString::fromUtf8(Settings::GetControllerTypeDisplayName(static_cast<ControllerType>(i))));
+  }
+
+  QGridLayout* traits_layout = new QGridLayout(m_ui.compatibilityTraits);
+  for (u32 i = 0; i < static_cast<u32>(GameSettings::Trait::Count); i++)
+  {
+    m_trait_checkboxes[i] =
+      new QCheckBox(QString::fromUtf8(GameSettings::GetTraitDisplayName(static_cast<GameSettings::Trait>(i))),
+                    m_ui.compatibilityTraits);
+    traits_layout->addWidget(m_trait_checkboxes[i], i / 2, i % 2);
+  }
+
   setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 }
 
@@ -133,7 +175,7 @@ void GamePropertiesDialog::populateTracksInfo(const std::string& image_path)
     {"Audio", "Mode 1", "Mode 1/Raw", "Mode 2", "Mode 2/Form 1", "Mode 2/Form 2", "Mode 2/Mix", "Mode 2/Raw"}};
 
   m_ui.tracks->clearContents();
-  m_image_path = image_path;
+  m_path = image_path;
 
   std::unique_ptr<CDImage> image = CDImage::Open(image_path.c_str());
   if (!image)
@@ -155,6 +197,66 @@ void GamePropertiesDialog::populateTracksInfo(const std::string& image_path)
   }
 }
 
+void GamePropertiesDialog::populateGameSettings()
+{
+  const GameSettings::Entry& gs = m_game_settings;
+
+  for (u32 i = 0; i < static_cast<u32>(GameSettings::Trait::Count); i++)
+  {
+    QSignalBlocker sb(m_trait_checkboxes[i]);
+    m_trait_checkboxes[i]->setChecked(gs.HasTrait(static_cast<GameSettings::Trait>(i)));
+  }
+
+  if (gs.display_active_start_offset.has_value())
+  {
+    QSignalBlocker sb(m_ui.displayActiveStartOffset);
+    m_ui.displayActiveStartOffset->setValue(static_cast<int>(gs.display_active_start_offset.value()));
+  }
+  if (gs.display_active_end_offset.has_value())
+  {
+    QSignalBlocker sb(m_ui.displayActiveEndOffset);
+    m_ui.displayActiveEndOffset->setValue(static_cast<int>(gs.display_active_end_offset.value()));
+  }
+
+  if (gs.display_crop_mode.has_value())
+  {
+    QSignalBlocker sb(m_ui.userCropMode);
+    m_ui.userCropMode->setCurrentIndex(static_cast<int>(gs.display_crop_mode.value()) + 1);
+  }
+  if (gs.display_aspect_ratio.has_value())
+  {
+    QSignalBlocker sb(m_ui.userAspectRatio);
+    m_ui.userAspectRatio->setCurrentIndex(static_cast<int>(gs.display_aspect_ratio.value()) + 1);
+  }
+
+  if (gs.controller_1_type.has_value())
+  {
+    QSignalBlocker sb(m_ui.userControllerType1);
+    m_ui.userControllerType1->setCurrentIndex(static_cast<int>(gs.controller_1_type.value()) + 1);
+  }
+  if (gs.controller_2_type.has_value())
+  {
+    QSignalBlocker sb(m_ui.userControllerType2);
+    m_ui.userControllerType2->setCurrentIndex(static_cast<int>(gs.controller_2_type.value()) + 1);
+  }
+  if (gs.gpu_widescreen_hack.has_value())
+  {
+    QSignalBlocker sb(m_ui.userControllerType2);
+    m_ui.userWidescreenHack->setCheckState(Qt::Checked);
+  }
+  else
+  {
+    QSignalBlocker sb(m_ui.userControllerType2);
+    m_ui.userWidescreenHack->setCheckState(Qt::PartiallyChecked);
+  }
+}
+
+void GamePropertiesDialog::saveGameSettings()
+{
+  m_host_interface->getGameList()->UpdateGameSettings(m_path, m_game_code, m_game_title, m_game_settings, true, true);
+  m_host_interface->applySettings(true);
+}
+
 void GamePropertiesDialog::closeEvent(QCloseEvent* ev)
 {
   deleteLater();
@@ -186,6 +288,69 @@ void GamePropertiesDialog::connectUi()
   connect(m_ui.exportCompatibilityInfo, &QPushButton::clicked, this,
           &GamePropertiesDialog::onExportCompatibilityInfoClicked);
   connect(m_ui.close, &QPushButton::clicked, this, &QDialog::close);
+
+  connect(m_ui.userAspectRatio, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
+    if (index <= 0)
+      m_game_settings.display_aspect_ratio.reset();
+    else
+      m_game_settings.display_aspect_ratio = static_cast<DisplayAspectRatio>(index - 1);
+    saveGameSettings();
+  });
+
+  connect(m_ui.userCropMode, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
+    if (index <= 0)
+      m_game_settings.display_crop_mode.reset();
+    else
+      m_game_settings.display_crop_mode = static_cast<DisplayCropMode>(index - 1);
+    saveGameSettings();
+  });
+
+  connect(m_ui.userControllerType1, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
+    if (index <= 0)
+      m_game_settings.controller_1_type.reset();
+    else
+      m_game_settings.controller_1_type = static_cast<ControllerType>(index - 1);
+    saveGameSettings();
+  });
+
+  connect(m_ui.userControllerType2, QOverload<int>::of(&QComboBox::currentIndexChanged), [this](int index) {
+    if (index <= 0)
+      m_game_settings.controller_2_type.reset();
+    else
+      m_game_settings.controller_2_type = static_cast<ControllerType>(index - 1);
+    saveGameSettings();
+  });
+
+  connect(m_ui.userWidescreenHack, &QCheckBox::stateChanged, [this](int state) {
+    if (state == Qt::PartiallyChecked)
+      m_game_settings.gpu_widescreen_hack.reset();
+    else
+      m_game_settings.gpu_widescreen_hack = (state == Qt::Checked);
+    saveGameSettings();
+  });
+
+  for (u32 i = 0; i < static_cast<u32>(GameSettings::Trait::Count); i++)
+  {
+    connect(m_trait_checkboxes[i], &QCheckBox::toggled, [this, i](bool checked) {
+      m_game_settings.SetTrait(static_cast<GameSettings::Trait>(i), checked);
+      saveGameSettings();
+    });
+  }
+
+  connect(m_ui.displayActiveStartOffset, QOverload<int>::of(&QSpinBox::valueChanged), [this](int value) {
+    if (value == 0)
+      m_game_settings.display_active_start_offset.reset();
+    else
+      m_game_settings.display_active_start_offset = static_cast<s16>(value);
+    saveGameSettings();
+  });
+  connect(m_ui.displayActiveEndOffset, QOverload<int>::of(&QSpinBox::valueChanged), [this](int value) {
+    if (value == 0)
+      m_game_settings.display_active_end_offset.reset();
+    else
+      m_game_settings.display_active_end_offset = static_cast<s16>(value);
+    saveGameSettings();
+  });
 }
 
 void GamePropertiesDialog::fillEntryFromUi(GameListCompatibilityEntry* entry)
@@ -263,10 +428,10 @@ void GamePropertiesDialog::onExportCompatibilityInfoClicked()
 
 void GamePropertiesDialog::computeTrackHashes()
 {
-  if (m_image_path.empty())
+  if (m_path.empty())
     return;
 
-  std::unique_ptr<CDImage> image = CDImage::Open(m_image_path.c_str());
+  std::unique_ptr<CDImage> image = CDImage::Open(m_path.c_str());
   if (!image)
     return;
 

src/duckstation-qt/gamepropertiesdialog.h

@@ -1,6 +1,8 @@
 #pragma once
+#include "core/game_settings.h"
 #include "ui_gamepropertiesdialog.h"
 #include <QtWidgets/QDialog>
+#include <array>
 
 struct GameListEntry;
 struct GameListCompatibilityEntry;
@@ -40,15 +42,22 @@ private:
   void connectUi();
   void populateCompatibilityInfo(const std::string& game_code);
   void populateTracksInfo(const std::string& image_path);
+  void populateGameSettings();
+  void saveGameSettings();
   void fillEntryFromUi(GameListCompatibilityEntry* entry);
   void computeTrackHashes();
   void onResize();
 
   Ui::GamePropertiesDialog m_ui;
+  std::array<QCheckBox*, static_cast<u32>(GameSettings::Trait::Count)> m_trait_checkboxes{};
 
   QtHostInterface* m_host_interface;
 
-  std::string m_image_path;
+  std::string m_path;
+  std::string m_game_code;
+  std::string m_game_title;
+
+  GameSettings::Entry m_game_settings;
 
   bool m_compatibility_info_changed = false;
   bool m_tracks_hashed = false;

src/duckstation-qt/gamepropertiesdialog.ui

@@ -6,171 +6,346 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>722</width>
-    <height>466</height>
+    <width>793</width>
+    <height>647</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="resources/icons.qrc">
+   <iconset>
     <normaloff>:/icons/duck.png</normaloff>:/icons/duck.png</iconset>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>Image Path:</string>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
      </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>Properties</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Image Path:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="imagePath">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Game Code:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="gameCode">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Title:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="title">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Region:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QComboBox" name="region">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Compatibility:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QComboBox" name="compatibility"/>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Upscaling Issues:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QLineEdit" name="upscalingIssues"/>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Comments:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="comments"/>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Version Tested:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLineEdit" name="versionTested"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="setToCurrent">
+           <property name="text">
+            <string>Set to Current</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="8" column="0" colspan="2">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Tracks:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="0" colspan="2">
+        <widget class="QTableWidget" name="tracks">
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="cornerButtonEnabled">
+          <bool>false</bool>
+         </property>
+         <attribute name="verticalHeaderVisible">
+          <bool>false</bool>
+         </attribute>
+         <column>
+          <property name="text">
+           <string>#</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Mode</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Start</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Length</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Hash</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_3">
+      <attribute name="title">
+       <string>User Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>GPU Settings</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_17">
+            <property name="text">
+             <string>Crop Mode:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="userCropMode"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_18">
+            <property name="text">
+             <string>Aspect Ratio:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="userAspectRatio"/>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="userWidescreenHack">
+            <property name="text">
+             <string>Widescreen Hack</string>
+            </property>
+            <property name="tristate">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Controller Settings</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>Controller 1 Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="userControllerType1"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>Controller 2 Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="userControllerType2"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Compatibility Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QGroupBox" name="compatibilityTraits">
+         <property name="title">
+          <string>Traits</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="compatibilityOverrides">
+         <property name="title">
+          <string>Overrides</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Display Active Offset:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QSpinBox" name="displayActiveStartOffset">
+              <property name="minimum">
+               <number>-5000</number>
+              </property>
+              <property name="maximum">
+               <number>5000</number>
+              </property>
+              <property name="value">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="displayActiveEndOffset">
+              <property name="minimum">
+               <number>-5000</number>
+              </property>
+              <property name="maximum">
+               <number>5000</number>
+              </property>
+              <property name="value">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="imagePath">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Game Code:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="gameCode">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Title:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="title">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Region:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="region">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Compatibility:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="compatibility"/>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Upscaling Issues:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QLineEdit" name="upscalingIssues"/>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Comments:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <widget class="QLineEdit" name="comments"/>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_9">
-     <property name="text">
-      <string>Version Tested:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QLineEdit" name="versionTested"/>
-     </item>
-     <item>
-      <widget class="QPushButton" name="setToCurrent">
-       <property name="text">
-        <string>Set to Current</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="label_8">
-     <property name="text">
-      <string>Tracks:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QTableWidget" name="tracks">
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="cornerButtonEnabled">
-      <bool>false</bool>
-     </property>
-     <attribute name="verticalHeaderVisible">
-      <bool>false</bool>
-     </attribute>
-     <column>
-      <property name="text">
-       <string>#</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Mode</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Start</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Length</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Hash</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="10" column="0" colspan="2">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <spacer name="horizontalSpacer">

src/duckstation-qt/qthostinterface.cpp

@@ -280,16 +280,17 @@ void QtHostInterface::setDefaultSettings()
     m_settings_interface->Save();
 
     CommonHostInterface::LoadSettings(*m_settings_interface.get());
+    CommonHostInterface::ApplyGameSettings(false);
   }
 
   CheckForSettingsChanges(old_settings);
 }
 
-void QtHostInterface::applySettings()
+void QtHostInterface::applySettings(bool display_osd_messages /* = false */)
 {
   if (!isOnWorkerThread())
   {
-    QMetaObject::invokeMethod(this, "applySettings", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, "applySettings", Qt::QueuedConnection, Q_ARG(bool, display_osd_messages));
     return;
   }
 
@@ -297,6 +298,7 @@ void QtHostInterface::applySettings()
   {
     std::lock_guard<std::recursive_mutex> guard(m_settings_mutex);
     CommonHostInterface::LoadSettings(*m_settings_interface.get());
+    CommonHostInterface::ApplyGameSettings(display_osd_messages);
   }
 
   CheckForSettingsChanges(old_settings);
@@ -649,6 +651,7 @@ void QtHostInterface::OnSystemPerformanceCountersUpdated()
 void QtHostInterface::OnRunningGameChanged()
 {
   CommonHostInterface::OnRunningGameChanged();
+  applySettings(true);
 
   if (!System::IsShutdown())
   {

src/duckstation-qt/qthostinterface.h

@@ -129,7 +129,7 @@ Q_SIGNALS:
 
 public Q_SLOTS:
   void setDefaultSettings();
-  void applySettings();
+  void applySettings(bool display_osd_messages = false);
   void updateInputMap();
   void applyInputProfile(const QString& profile_path);
   void onDisplayWindowKeyEvent(int key, bool pressed);