archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 17:01:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle some undefined behavior regarding null pads

Browse source
This commit is contained in:
Megamouse 2020-11-26 00:06:03 +01:00
parent ca9898e838
commit 9e352da052
8 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -1027,8 +1027,8 @@ void pad_settings_dialog::UpdateLabels(bool is_reset)
entry.second.text = qstr(entry.second.key);
}
// The button has to contain at least a space, because it would be square'ish otherwise
m_padButtons->button(entry.first)->setText(entry.second.text.isEmpty() ? QStringLiteral(" ") : entry.second.text);
// The button has to contain at least one character, because it would be square'ish otherwise
m_padButtons->button(entry.first)->setText(entry.second.text.isEmpty() ? QStringLiteral("-") : entry.second.text);
}
}
@ -1401,7 +1401,11 @@ void pad_settings_dialog::ChangeProfile()
}
// Load new config
m_handler_cfg.load();
if (m_handler->m_type != pad_handler::null && !m_handler_cfg.load())
{
cfg_log.error("Could not load pad config file '%s'", m_handler_cfg.cfg_name);
m_handler_cfg.from_default();
}
// Reload the buttons with the new handler and profile
ReloadButtons();