aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2016-01-07 23:47:01 +0200
committernotaz2016-01-07 23:51:43 +0200
commitc3341ffd2f06fadeca07b74279070c334b8d8cc1 (patch)
tree3d565d57d810597583c04667a426180055d8119e
parent85f2398236b54db46340dad14330102f281ca4f3 (diff)
downloadpcsx_rearmed-c3341ffd2f06fadeca07b74279070c334b8d8cc1.tar.gz
pcsx_rearmed-c3341ffd2f06fadeca07b74279070c334b8d8cc1.tar.bz2
pcsx_rearmed-c3341ffd2f06fadeca07b74279070c334b8d8cc1.zip
menu: fix input config for device names ending with space
reported by KP142EH12 and perhaps somebody else I forgot also take the opportunity to update libpicofe
m---------frontend/libpicofe0
-rw-r--r--frontend/menu.c5
2 files changed, 3 insertions, 2 deletions
diff --git a/frontend/libpicofe b/frontend/libpicofe
-Subproject 26ea18173c1228dd5ce39e2a88ffe1ae10fcb36
+Subproject 21604a047941b8fe81d381ede0371c75da964af
diff --git a/frontend/menu.c b/frontend/menu.c
index 0088a63..9ddbe37 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -903,8 +903,6 @@ static void get_line(char *d, size_t size, const char *s)
len = size - 1;
strncpy(d, s, len);
d[len] = 0;
-
- mystrip(d);
}
static void keys_write_all(FILE *f)
@@ -1011,7 +1009,10 @@ static void keys_load_all(const char *cfg)
while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
p += 10;
+ // don't strip 'dev' because there are weird devices
+ // with names with space at the end
get_line(dev, sizeof(dev), p);
+
dev_id = in_config_parse_dev(dev);
if (dev_id < 0) {
printf("input: can't handle dev: %s\n", dev);