From 9cbefa468a7a8989b13cf8a943c2a171c995fedd Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Mon, 3 Apr 2023 13:59:56 -0700
Subject: [PATCH] qt: Disable system update downloader in per-game settings.
 (#6402)

---
 .../configuration/configure_system.cpp        |   3 +
 .../configuration/configure_system.ui         | 146 +++++++++---------
 2 files changed, 77 insertions(+), 72 deletions(-)

diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp
index 14cf4c65b..0b86906ed 100644
--- a/src/citra_qt/configuration/configure_system.cpp
+++ b/src/citra_qt/configuration/configure_system.cpp
@@ -531,6 +531,9 @@ void ConfigureSystem::SetupPerGameUI() {
     ui->label_plugin_loader->setVisible(false);
     ui->plugin_loader->setVisible(false);
     ui->allow_plugin_loader->setVisible(false);
+    // Disable the system firmware downloader.
+    ui->label_nus_download->setVisible(false);
+    ui->body_nus_download->setVisible(false);
 
     ConfigurationShared::SetColoredTristate(ui->toggle_new_3ds, Settings::values.is_new_3ds,
                                             is_new_3ds);
diff --git a/src/citra_qt/configuration/configure_system.ui b/src/citra_qt/configuration/configure_system.ui
index d73e70d52..cfb50818b 100644
--- a/src/citra_qt/configuration/configure_system.ui
+++ b/src/citra_qt/configuration/configure_system.ui
@@ -369,82 +369,84 @@
          </widget>
         </item>
         <item row="15" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_nus_download">
-          <item>
-           <widget class="QComboBox" name="combo_download_set">
-            <item>
-             <property name="text">
-              <string>Minimal</string>
+         <widget class="QWidget" name="body_nus_download">
+          <layout class="QHBoxLayout" name="horizontalLayout_nus_download">
+           <item>
+            <widget class="QComboBox" name="combo_download_set">
+             <item>
+              <property name="text">
+               <string>Minimal</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Old 3DS</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>New 3DS</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QComboBox" name="combo_download_region">
+             <item>
+              <property name="text">
+               <string>JPN</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>USA</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>EUR</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>AUS</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>CHN</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>KOR</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>TWN</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="button_start_download">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
              </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Old 3DS</string>
+             <property name="layoutDirection">
+              <enum>Qt::RightToLeft</enum>
              </property>
-            </item>
-            <item>
              <property name="text">
-              <string>New 3DS</string>
+              <string>Download</string>
              </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="combo_download_region">
-            <item>
-             <property name="text">
-              <string>JPN</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>USA</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>EUR</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>AUS</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>CHN</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>KOR</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>TWN</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="button_start_download">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="layoutDirection">
-             <enum>Qt::RightToLeft</enum>
-            </property>
-            <property name="text">
-             <string>Download</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
+            </widget>
+           </item>
+          </layout>
+         </widget>
         </item>
        </layout>
       </widget>