claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Joystick configuration no longer gets discarded when joystick type is set to 0 (standard 2-button joystick), fixes saving joystick settings for that joystick type.

Browse Source
This commit is contained in:
OBattler
2018-10-06 20:42:13 +02:00
parent 0b6a026215
commit c2bbe59949
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.c
View File

@@ -8,7 +8,7 @@
* *
* Configuration file handler. * Configuration file handler.
* *
* Version: @(#)config.c 1.0.55 2018/10/02 * Version: @(#)config.c 1.0.56 2018/10/06
* *
* Authors: Sarah Walker, * Authors: Sarah Walker,
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -1467,13 +1467,10 @@ save_input_devices(void)
config_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type)); config_set_string(cat, "mouse_type", mouse_get_internal_name(mouse_type));
if ((joystick_type == 0) || (joystick_type == 7)) { if (joystick_type == 7) {
if (joystick_type == 7) config_delete_var(cat, "joystick_type");
config_delete_var(cat, "joystick_type");
else
config_set_int(cat, "joystick_type", joystick_type);
for (c=0; c<16; c++) { for (c = 0; c < 16; c++) {
sprintf(tmp2, "joystick_%i_nr", c); sprintf(tmp2, "joystick_%i_nr", c);
config_delete_var(cat, tmp2); config_delete_var(cat, tmp2);
@@ -1493,7 +1490,7 @@ save_input_devices(void)
} else { } else {
config_set_int(cat, "joystick_type", joystick_type); config_set_int(cat, "joystick_type", joystick_type);
for (c=0; c<joystick_get_max_joysticks(joystick_type); c++) { for (c = 0; c < joystick_get_max_joysticks(joystick_type); c++) {
sprintf(tmp2, "joystick_%i_nr", c); sprintf(tmp2, "joystick_%i_nr", c);
config_set_int(cat, tmp2, joystick_state[c].plat_joystick_nr); config_set_int(cat, tmp2, joystick_state[c].plat_joystick_nr);