thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Bashar Astifan 2023-05-03 23:23:29 +04:00 • committed by GitHub
commit 132a00ade3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
120 changed files with 1253 additions and 575 deletions
Download patch file Download diff file Expand all files Collapse all files

8
UI/NativeApp.cpp
View file

@ -1279,7 +1279,7 @@ bool NativeKey(const KeyInput &key) {
// INFO_LOG(SYSTEM, "Key code: %i flags: %i", key.keyCode, key.flags);
#if !defined(MOBILE_DEVICE)
if (g_Config.bPauseExitsEmulator) {
static std::vector<int> pspKeys;
std::vector<int> pspKeys;
pspKeys.clear();
if (KeyMap::InputMappingToPspButton(InputMapping(key.deviceId, key.keyCode), &pspKeys)) {
if (std::find(pspKeys.begin(), pspKeys.end(), VIRTKEY_PAUSE) != pspKeys.end()) {
@ -1289,10 +1289,10 @@ bool NativeKey(const KeyInput &key) {
}
}
#endif
bool retval = false;
if (g_screenManager)
{
HLEPlugins::PluginDataKeys[key.keyCode] = (key.flags & KEY_DOWN) ? 1 : 0;
if (g_screenManager) {
HLEPlugins::SetKey(key.keyCode, (key.flags & KEY_DOWN) ? 1 : 0);
retval = g_screenManager->key(key);
}