Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the last commit slightly safer by adding a mutex

Browse Source
This commit is contained in:
Henrik Rydgard 2016-09-11 18:59:06 +02:00
parent 0926cabb00
commit f77ba7ba3a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/ControlMappingScreen.cpp
View File

@ -18,6 +18,7 @@
#include <algorithm>
#include <deque>
#include "base/mutex.h"
#include "base/colorutil.h"
#include "base/logging.h"
#include "i18n/i18n.h"
@ -437,6 +438,9 @@ bool AnalogTestScreen::key(const KeyInput &key) {
screenManager()->finishDialog(this, DR_BACK);
return true;
}
lock_guard guard(eventLock_);
char buf[512];
snprintf(buf, sizeof(buf), "Keycode: %d Device ID: %d [%s%s%s%s]", key.keyCode, key.deviceId,
(key.flags & KEY_IS_REPEAT) ? "REP" : "",
@ -457,6 +461,8 @@ bool AnalogTestScreen::axis(const AxisInput &axis) {
// a controller would be confusing for the user.
char buf[512];
lock_guard guard(eventLock_);
if (IgnoreAxisForMapping(axis.axisId))
return false;
@ -476,6 +482,8 @@ bool AnalogTestScreen::axis(const AxisInput &axis) {
void AnalogTestScreen::CreateViews() {
using namespace UI;
lock_guard guard(eventLock_);
I18NCategory *di = GetI18NCategory("Dialog");
root_ = new LinearLayout(ORIENT_VERTICAL);

3
UI/ControlMappingScreen.h
View File

@ -19,6 +19,7 @@
#include <vector>
#include "base/functional.h"
#include "base/mutex.h"
#include "ui/view.h"
#include "ui/ui_screen.h"
@ -80,4 +81,6 @@ protected:
UI::TextView *lastKeyEvent_;
UI::TextView *lastLastKeyEvent_;
recursive_mutex eventLock_;
};