Compare commits

...

2 Commits

Author SHA1 Message Date
Silent
cd3e11bff7 InputManager: Release settings lock before shutting down the input source 2024-07-13 07:29:26 -04:00
refractionpcsx2
2f46e5a840 UI: Fix updater to ignore installer version 2024-07-13 04:19:16 +01:00
2 changed files with 15 additions and 0 deletions

View File

@@ -264,6 +264,7 @@ void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8
const QJsonObject asset_object(asset_value.toObject());
const QJsonArray additional_tags_array(asset_object["additionalTags"].toArray());
bool is_symbols = false;
bool is_installer = false;
bool is_avx2 = false;
bool is_sse4 = false;
bool is_perfect_match = false;
@@ -276,6 +277,12 @@ void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8
is_symbols = true;
break;
}
if (additional_tag_str == QStringLiteral("installer"))
{
// we're not interested in installer download
is_installer = true;
break;
}
else if (additional_tag_str == QStringLiteral("SSE4"))
{
is_sse4 = true;
@@ -299,6 +306,11 @@ void AutoUpdaterDialog::getLatestReleaseComplete(s32 status_code, std::vector<u8
continue;
}
if (is_installer)
{
// skip this asset
continue;
}
#ifdef _M_X86
if (is_avx2 && cpuinfo_has_x86_avx2())
{

View File

@@ -1605,7 +1605,10 @@ void InputManager::UpdateInputSourceState(SettingsInterface& si, std::unique_loc
{
if (s_input_sources[static_cast<u32>(type)])
{
settings_lock.unlock();
s_input_sources[static_cast<u32>(type)]->Shutdown();
settings_lock.lock();
s_input_sources[static_cast<u32>(type)].reset();
}
}