ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8592 from phcoder/devid 

ButtonManager: Fix handling of empty device id.
This commit is contained in:
Léo Lam 2020-02-02 16:52:12 +01:00 committed by GitHub
parent 06d0b1ad48 02c5d292fa
commit 0491831483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/InputCommon/ControllerInterface/Touch/ButtonManager.cpp
View File

@ -10,6 +10,7 @@
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h" #include "Common/Thread.h"
#include "InputCommon/ControllerInterface/Touch/ButtonManager.h" #include "InputCommon/ControllerInterface/Touch/ButtonManager.h"
@ -630,7 +631,7 @@ void Init(const std::string& game_id)
config << CONFIG_STRINGS[a] << "_" << pad_id; config << CONFIG_STRINGS[a] << "_" << pad_id;
BindType type; BindType type;
int bindnum; int bindnum;
char dev[128]; char dev[128]{};
bool hasbind = false; bool hasbind = false;
char modifier = '+'; char modifier = '+';
std::string value; std::string value;
@ -641,13 +642,19 @@ void Init(const std::string& game_id)
{ {
hasbind = true; hasbind = true;
type = BIND_AXIS; type = BIND_AXIS;
sscanf(value.c_str(), "Device '%127[^\']'-Axis %d%c", dev, &bindnum, &modifier); if (StringBeginsWith(value, "Device ''"))
sscanf(value.c_str(), "Device ''-Axis %d%c", &bindnum, &modifier);
else
sscanf(value.c_str(), "Device '%127[^\']'-Axis %d%c", dev, &bindnum, &modifier);
} }
else if (std::string::npos != value.find("Button")) else if (std::string::npos != value.find("Button"))
{ {
hasbind = true; hasbind = true;
type = BIND_BUTTON; type = BIND_BUTTON;
sscanf(value.c_str(), "Device '%127[^\']'-Button %d", dev, &bindnum); if (StringBeginsWith(value, "Device ''"))
sscanf(value.c_str(), "Device ''-Button %d", &bindnum);
else
sscanf(value.c_str(), "Device '%127[^\']'-Button %d", dev, &bindnum);
} }
if (hasbind) if (hasbind)
AddBind(std::string(dev), AddBind(std::string(dev),