diff options
author | twinaphex | 2016-03-02 04:03:11 +0100 |
---|---|---|
committer | twinaphex | 2016-03-02 04:03:11 +0100 |
commit | b9c86313f1a99cd8193fbf36ccc08295a9639725 (patch) | |
tree | e5f9f1e2ab31509f72b93af4533dc7276a40bea5 /frontend | |
parent | 966a06cd644d812dc75c9b91a58168fef6ab6db8 (diff) | |
parent | 5644b26c23a4abd9511c56f39c369a46017585b8 (diff) | |
download | pcsx_rearmed-b9c86313f1a99cd8193fbf36ccc08295a9639725.tar.gz pcsx_rearmed-b9c86313f1a99cd8193fbf36ccc08295a9639725.tar.bz2 pcsx_rearmed-b9c86313f1a99cd8193fbf36ccc08295a9639725.zip |
Merge https://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'frontend')
m--------- | frontend/libpicofe | 0 | ||||
-rw-r--r-- | frontend/menu.c | 5 |
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 5737db4..4fd0b56 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); |