mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 07:21:20 +00:00
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Io/MouseHandler.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include <list>
#include "Utilities/mutex.h"

4
rpcs3/Emu/Io/Null/NullKeyboardHandler.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "Emu/Io/KeyboardHandler.h"
@ -10,7 +10,7 @@ public:
memset(&m_info, 0, sizeof(KbInfo));
m_info.max_connect = max_connect;
m_keyboards.clear();
for(u32 i=0; i<max_connect; i++)
for (u32 i = 0; i < max_connect; i++)
{
m_keyboards.emplace_back(Keyboard());
}

2
rpcs3/Emu/Io/Null/NullMouseHandler.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "Emu/Io/MouseHandler.h"

2
rpcs3/Emu/Io/Null/NullPadHandler.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "Emu/Io/PadHandler.h"

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);

2
rpcs3/rpcs3qt/gs_frame.h
View File

@ -36,7 +36,7 @@ private:
std::shared_ptr<gui_settings> m_gui_settings;
u64 m_frames = 0;
// display status of last title update
// display status of last title update, needed for dynamic changes of the fps setting
bool m_show_fps_in_title = false;
QString m_windowTitle;
bool m_disable_mouse;