history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-10 18:15:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CommonHostInterface: Move input map update to frontend

Browse Source 
Fixes controller state getting reset when loading input profile.
This commit is contained in:
Connor McLaughlin
2021-01-09 14:54:52 +10:00
parent ad0d16e243
commit 4fafb34251
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/duckstation-qt/qthostinterface.cpp
View File

@ -767,8 +767,17 @@ void QtHostInterface::applyInputProfile(const QString& profile_path)
return;
}
std::lock_guard<std::recursive_mutex> lock(m_settings_mutex);
ApplyInputProfile(profile_path.toUtf8().data(), *m_settings_interface.get());
Settings old_settings(std::move(g_settings));
{
std::lock_guard<std::recursive_mutex> lock(m_settings_mutex);
CommonHostInterface::ApplyInputProfile(profile_path.toUtf8().data(), *m_settings_interface.get());
CommonHostInterface::LoadSettings(*m_settings_interface.get());
CommonHostInterface::ApplyGameSettings(false);
CommonHostInterface::FixIncompatibleSettings(false);
}
CheckForSettingsChanges(old_settings);
emit inputProfileLoaded();
}

5
src/frontend-common/common_host_interface.cpp
View File

@ -1880,11 +1880,6 @@ void CommonHostInterface::ApplyInputProfile(const char* profile_path, SettingsIn
}
}
if (System::IsValid())
System::UpdateControllers();
UpdateInputMap(si);
ReportFormattedMessage(TranslateString("OSDMessage", "Loaded input profile from '%s'"), profile_path);
}