ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' (early part) into medusa

This commit is contained in:
Vicki Pfau 2021-06-11 20:48:59 -07:00
parent de75fc28a3 b6bc8d54e3
commit 6d4581e8f1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/qt/input/InputController.cpp
View File

@ -291,6 +291,9 @@ void InputController::loadConfiguration(uint32_t type) {
}
void InputController::loadProfile(uint32_t type, const QString& profile) {
if (profile.isEmpty()) {
return;
}
const InputProfile* ip = InputProfile::findProfile(profile);
if (ip) {
ip->apply(this);
@ -321,6 +324,9 @@ void InputController::saveConfiguration(uint32_t type) {
}
void InputController::saveProfile(uint32_t type, const QString& profile) {
if (profile.isEmpty()) {
return;
}
if (m_activeKeyInfo) {
mInputProfileSave(&m_inputMap, type, m_config->input(), profile.toUtf8().constData());
}