mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-18 23:42:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

squash (#8)

Browse source 
* 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:
Nayla 2023-04-11 19:19:57 -04:00 • committed by GitHub
commit 4b50513726
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 218 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DolphinQt/DolphinQt.vcxproj
View file

@ -5,6 +5,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{FA3FA62B-6F58-4B86-9453-4D149940A066}</ProjectGuid>
<ProjectName>Dolphin</ProjectName>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VSPropsDir)Configuration.Application.props" />
@ -37,10 +38,8 @@
<AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!--Jump through some hoops to generate a pch file local to this project-->
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
@ -450,6 +449,7 @@
<DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
<DataUserFiles Include="$(DolphinRootDir)Data\**\User\**\*.*" />
<DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
<DataTxtFiles Include="$(DolphinRootDir)Data\portable.txt" />
<BinaryFiles Include="$(TargetPath)" />
<AllInputFiles Include="@(DataSysFiles);@(DataUserFiles);@(DataTxtFiles);@(BinaryFiles)" />
</ItemGroup>

20
Source/Core/DolphinQt/Settings/GeneralPane.cpp
View file

@ -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)