You're a checkbox now

Author: ilikepizza107

Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp

@@ -139,6 +139,7 @@ void NetPlayDialog::CreateMainLayout()
   m_player_buffer_size_box = new QSpinBox;
   m_player_buffer_label = new QLabel(tr("Player Buffer:"));
   m_quit_button = new QPushButton(tr("Quit"));
+  m_brawlmusic_off = new QCheckBox(tr("Client Side Music Off"));
   m_splitter = new QSplitter(Qt::Horizontal);
   m_menu_bar = new QMenuBar(this);
 
@@ -244,9 +245,6 @@ void NetPlayDialog::CreateMainLayout()
   m_hide_remote_gbas_action = m_other_menu->addAction(tr("Hide Remote GBAs"));
   m_hide_remote_gbas_action->setCheckable(true);
 
-  m_brawlmusic_off_action = m_other_menu->addAction(tr("Client Side Music Off"));
-  m_brawlmusic_off_action->setCheckable(true);
-
   m_game_button->setDefault(false);
   m_game_button->setAutoDefault(false);
 
@@ -268,7 +266,8 @@ void NetPlayDialog::CreateMainLayout()
   options_widget->addWidget(m_minimum_buffer_size_box, 0, 2, Qt::AlignVCenter);
   options_widget->addWidget(m_player_buffer_label, 0, 3, Qt::AlignVCenter);
   options_widget->addWidget(m_player_buffer_size_box, 0, 4, Qt::AlignVCenter);
-  options_widget->addWidget(m_quit_button, 0, 6, Qt::AlignVCenter | Qt::AlignRight);
+  options_widget->addWidget(m_brawlmusic_off, 0, 6, Qt::AlignVCenter);
+  options_widget->addWidget(m_quit_button, 0, 7, Qt::AlignVCenter | Qt::AlignRight);
   options_widget->setColumnStretch(5, 1000);
 
   m_main_layout->addLayout(options_widget, 2, 0, 1, -1, Qt::AlignRight);
@@ -450,7 +449,7 @@ void NetPlayDialog::ConnectWidgets()
   connect(m_golf_mode_overlay_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings);
   connect(m_fixed_delay_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings);
   connect(m_hide_remote_gbas_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings);
-  connect(m_brawlmusic_off_action, &QAction::toggled, this, &NetPlayDialog::SaveSettings);
+  connect(m_brawlmusic_off, &QCheckBox::toggled, this, &NetPlayDialog::SaveSettings);
 }
 
 void NetPlayDialog::SendMessage(const std::string& msg)
@@ -464,7 +463,7 @@ void NetPlayDialog::SendMessage(const std::string& msg)
 
 bool NetPlayDialog::IsMusicOff()
 {
-  std::optional<bool> brawlmusic_off = RunOnObject(m_brawlmusic_off_action, &QAction::isChecked);
+  std::optional<bool> brawlmusic_off = RunOnObject(m_brawlmusic_off, &QCheckBox::isChecked);
   if (brawlmusic_off)
     return *brawlmusic_off;
   return false;
@@ -904,7 +903,7 @@ void NetPlayDialog::SetOptionsEnabled(bool enabled)
     m_host_input_authority_action->setEnabled(enabled);
     m_golf_mode_action->setEnabled(enabled);
     m_fixed_delay_action->setEnabled(enabled);
-    m_brawlmusic_off_action->setEnabled(enabled);
+    m_brawlmusic_off->setEnabled(enabled);
   }
 
   m_record_input_action->setEnabled(enabled);
@@ -1210,7 +1209,7 @@ void NetPlayDialog::LoadSettings()
   m_golf_mode_overlay_action->setChecked(golf_mode_overlay);
   m_hide_remote_gbas_action->setChecked(hide_remote_gbas);
 
-  m_brawlmusic_off_action->setChecked(brawlmusic_off);
+  m_brawlmusic_off->setChecked(brawlmusic_off);
 
   const std::string network_mode = Config::Get(Config::NETPLAY_NETWORK_MODE);
 
@@ -1254,7 +1253,7 @@ void NetPlayDialog::SaveSettings()
   Config::SetBase(Config::NETPLAY_STRICT_SETTINGS_SYNC, m_strict_settings_sync_action->isChecked());
   Config::SetBase(Config::NETPLAY_GOLF_MODE_OVERLAY, m_golf_mode_overlay_action->isChecked());
   Config::SetBase(Config::NETPLAY_HIDE_REMOTE_GBAS, m_hide_remote_gbas_action->isChecked());
-  Config::SetBase(Config::NETPLAY_BRAWL_MUSIC_OFF, m_brawlmusic_off_action->isChecked());
+  Config::SetBase(Config::NETPLAY_BRAWL_MUSIC_OFF, m_brawlmusic_off->isChecked());
 
   std::string network_mode;
   if (m_fixed_delay_action->isChecked())

Source/Core/DolphinQt/NetPlay/NetPlayDialog.h

@@ -9,6 +9,7 @@
 
 #include <QDialog>
 #include <QMenuBar>
+#include <QCheckBox>
 
 #include "Common/Lazy.h"
 #include "Core/NetPlayClient.h"
@@ -162,7 +163,7 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
   QAction* m_golf_mode_overlay_action;
   QAction* m_fixed_delay_action;
   QAction* m_hide_remote_gbas_action;
-  QAction* m_brawlmusic_off_action;
+  QCheckBox* m_brawlmusic_off;
   QPushButton* m_quit_button;
   QSplitter* m_splitter;
   QActionGroup* m_network_mode_group;