Bug fix: disable unused update track feature

Author: Motobug

Source/Core/DolphinQt/Settings/GeneralPane.cpp

@@ -72,8 +72,8 @@ void GeneralPane::CreateLayout()
   // Create layout here
   CreateBasic();
 
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
-    CreateAutoUpdate();
+  /* if (AutoUpdateChecker::SystemSupportsAutoUpdates())
+    CreateAutoUpdate(); */ // disabled for P+ updater
 
   CreateFallbackRegion();
 
@@ -106,13 +106,13 @@ void GeneralPane::ConnectLayout()
   connect(m_checkbox_discord_presence, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
 #endif
 
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
+  /* if (AutoUpdateChecker::SystemSupportsAutoUpdates())
   {
     connect(m_combobox_update_track, &QComboBox::currentIndexChanged, this,
             &GeneralPane::OnSaveConfig);
     connect(&Settings::Instance(), &Settings::AutoUpdateTrackChanged, this,
             &GeneralPane::LoadConfig);
-  }
+  } */ // disabled for P+ updater
 
   // Advanced
   connect(m_combobox_speedlimit, &QComboBox::currentIndexChanged, [this]() {
@@ -181,7 +181,7 @@ void GeneralPane::CreateBasic()
   speed_limit_layout->addRow(tr("&Speed Limit:"), m_combobox_speedlimit);
 }
 
-void GeneralPane::CreateAutoUpdate()
+/* void GeneralPane::CreateAutoUpdate()
 {
   auto* auto_update_group = new QGroupBox(tr("Auto Update Settings"));
   auto* auto_update_group_layout = new QFormLayout;
@@ -202,7 +202,7 @@ void GeneralPane::CreateAutoUpdate()
   {
     m_combobox_update_track->addItem(option);
   }
-}
+} */ // disabled for P+ updater
 
 void GeneralPane::CreateFallbackRegion()
 {
@@ -242,7 +242,7 @@ void GeneralPane::LoadConfig()
 {
   const QSignalBlocker blocker(this);
 
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
+  /* if (AutoUpdateChecker::SystemSupportsAutoUpdates())
   {
     const auto track = Settings::Instance().GetAutoUpdateTrack().toStdString();
 
@@ -254,7 +254,7 @@ void GeneralPane::LoadConfig()
       SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_DEV_INDEX);
     else
       SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_BETA_INDEX);
-  }
+  } */ // disabled for P+ updater
 
 #if defined(USE_ANALYTICS) && USE_ANALYTICS
   SignalBlocking(m_checkbox_enable_analytics)
@@ -332,11 +332,11 @@ void GeneralPane::OnSaveConfig()
   Config::ConfigChangeCallbackGuard config_guard;
 
   auto& settings = SConfig::GetInstance();
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
+  /* if (AutoUpdateChecker::SystemSupportsAutoUpdates())
   {
     Settings::Instance().SetAutoUpdateTrack(
         UpdateTrackFromIndex(m_combobox_update_track->currentIndex()));
-  }
+  } */ // disabled for P+ updater
 
 #ifdef USE_DISCORD_PRESENCE
   Discord::SetDiscordPresenceEnabled(m_checkbox_discord_presence->isChecked());
@@ -454,11 +454,11 @@ void GeneralPane::AddDescriptions()
   m_combobox_speedlimit->SetTitle(tr("Speed Limit"));
   m_combobox_speedlimit->SetDescription(tr(TR_SPEEDLIMIT_DESCRIPTION));
 
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
+  /* if (AutoUpdateChecker::SystemSupportsAutoUpdates())
   {
     m_combobox_update_track->SetTitle(tr("Auto Update"));
     m_combobox_update_track->SetDescription(tr(TR_UPDATE_TRACK_DESCRIPTION));
-  }
+  } */ // disabled for P+ updater
 
   m_combobox_fallback_region->SetTitle(tr("Fallback Region"));
   m_combobox_fallback_region->SetDescription(tr(TR_FALLBACK_REGION_DESCRIPTION));

Source/Core/DolphinQt/Settings/GeneralPane.h

@@ -32,7 +32,7 @@ class GeneralPane final : public QWidget
   void CreateLayout();
   void ConnectLayout();
   void CreateBasic();
-  void CreateAutoUpdate();
+  // void CreateAutoUpdate(); // disabled, as we do not have separate update tracks for P+
   void CreateFallbackRegion();
   void AddDescriptions();
 
@@ -43,7 +43,7 @@ class GeneralPane final : public QWidget
   // Widgets
   QVBoxLayout* m_main_layout;
   ToolTipComboBox* m_combobox_speedlimit;
-  ToolTipComboBox* m_combobox_update_track;
+  // ToolTipComboBox* m_combobox_update_track;
   ToolTipComboBox* m_combobox_fallback_region;
   ConfigBool* m_checkbox_dualcore;
   ConfigBool* m_checkbox_cheats;