mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-08 00:59:44 +00:00
squash (#8)
* Update macos.yml * Update linux.yml * Update windows.yml * Create pull.yml * Update linux.yml * Update MPN Code for Memory changes * fix config crash * Source * Update pull.yml * Update windows.yml * Update windows.yml * Update windows.yml (#7) * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml * Update windows.yml
This commit is contained in:
parent
1e466a032b
commit
4b50513726
57 changed files with 218 additions and 178 deletions
|
@ -99,14 +99,6 @@ void GeneralPane::ConnectLayout()
|
|||
connect(m_checkbox_discord_presence, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
|
||||
#endif
|
||||
|
||||
if (AutoUpdateChecker::SystemSupportsAutoUpdates())
|
||||
{
|
||||
connect(m_combobox_update_track, qOverload<int>(&QComboBox::currentIndexChanged), this,
|
||||
&GeneralPane::OnSaveConfig);
|
||||
connect(&Settings::Instance(), &Settings::AutoUpdateTrackChanged, this,
|
||||
&GeneralPane::LoadConfig);
|
||||
}
|
||||
|
||||
// Advanced
|
||||
connect(m_combobox_speedlimit, qOverload<int>(&QComboBox::currentIndexChanged), [this]() {
|
||||
Config::SetBaseOrCurrent(Config::MAIN_EMULATION_SPEED,
|
||||
|
@ -218,18 +210,6 @@ void GeneralPane::LoadConfig()
|
|||
const QSignalBlocker blocker(this);
|
||||
|
||||
if (AutoUpdateChecker::SystemSupportsAutoUpdates())
|
||||
{
|
||||
const auto track = Settings::Instance().GetAutoUpdateTrack().toStdString();
|
||||
|
||||
// If the track doesn't match any known value, set to "beta" which is the
|
||||
// default config value on Dolphin release builds.
|
||||
if (track == AUTO_UPDATE_DISABLE_STRING)
|
||||
SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_DISABLE_INDEX);
|
||||
else if (track == AUTO_UPDATE_DEV_STRING)
|
||||
SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_DEV_INDEX);
|
||||
else
|
||||
SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_BETA_INDEX);
|
||||
}
|
||||
|
||||
#if defined(USE_ANALYTICS) && USE_ANALYTICS
|
||||
SignalBlocking(m_checkbox_enable_analytics)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue