RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 06:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Input: avoid exception while no keyboard is registered

Browse source
This commit is contained in:
Megamouse 2019-10-17 20:30:26 +02:00
parent 1046184dd0
commit d6664450df
6 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/basic_keyboard_handler.cpp
View file

@ -79,7 +79,7 @@ void basic_keyboard_handler::keyPressEvent(QKeyEvent* keyEvent)
return;
}
if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
{
keyEvent->ignore();
return;
@ -100,7 +100,7 @@ void basic_keyboard_handler::keyReleaseEvent(QKeyEvent* keyEvent)
return;
}
if (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat)
if (m_keyboards.empty() || (keyEvent->isAutoRepeat() && !m_keyboards[0].m_key_repeat))
{
keyEvent->ignore();
return;
@ -153,6 +153,11 @@ s32 basic_keyboard_handler::getUnmodifiedKey(QKeyEvent* keyEvent)
void basic_keyboard_handler::LoadSettings()
{
if (m_keyboards.empty())
{
return;
}
// Meta Keys
//m_keyboards[0].m_buttons.emplace_back(Qt::Key_Control, CELL_KB_MKEY_L_CTRL);
m_keyboards[0].m_buttons.emplace_back(Qt::Key_Shift, CELL_KB_MKEY_L_SHIFT);