Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correctly save and load WiFi driver from the config file

Browse source
This commit is contained in:
Jean-André Santoni 2016-09-21 18:51:40 +02:00 committed by twinaphex
parent c45058d3ae
commit 39be71e4ad
3 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
configuration.c
View file

@ -436,6 +436,26 @@ const char *config_get_default_camera(void)
return "null";
}
/**
* config_get_default_wifi:
*
* Gets default wifi driver.
*
* Returns: Default wifi driver.
**/
const char *config_get_default_wifi(void)
{
switch (WIFI_DEFAULT_DRIVER)
{
case WIFI_CONNMANCTL:
return "connmanctl";
default:
break;
}
return "null";
}
/**
* config_get_default_location:
*
@ -523,6 +543,7 @@ static int populate_settings_array(settings_t *settings, struct config_array_set
SETTING_ARRAY("video_driver", settings->video.driver, false, NULL, true);
SETTING_ARRAY("record_driver", settings->record.driver, false, NULL, true);
SETTING_ARRAY("camera_driver", settings->camera.driver, false, NULL, true);
SETTING_ARRAY("wifi_driver", settings->wifi.driver, false, NULL, true);
SETTING_ARRAY("location_driver", settings->location.driver,false, NULL, true);
#ifdef HAVE_MENU
SETTING_ARRAY("menu_driver", settings->menu.driver, false, NULL, true);
@ -946,6 +967,7 @@ static void config_set_defaults(void)
const char *def_menu = config_get_default_menu();
#endif
const char *def_camera = config_get_default_camera();
const char *def_wifi = config_get_default_wifi();
const char *def_location = config_get_default_location();
const char *def_record = config_get_default_record();
struct config_bool_setting *bool_settings = NULL;
@ -979,6 +1001,9 @@ static void config_set_defaults(void)
if (def_camera)
strlcpy(settings->camera.driver,
def_camera, sizeof(settings->camera.driver));
if (def_wifi)
strlcpy(settings->wifi.driver,
def_wifi, sizeof(settings->wifi.driver));
if (def_location)
strlcpy(settings->location.driver,
def_location, sizeof(settings->location.driver));

9
configuration.h
View file

@ -472,6 +472,15 @@ typedef struct settings
**/
const char *config_get_default_camera(void);
/**
* config_get_default_wifi:
*
* Gets default wifi driver.
*
* Returns: Default wifi driver.
**/
const char *config_get_default_wifi(void);
/**
* config_get_default_location:
*

4
menu/menu_setting.c
View file

@ -2665,8 +2665,8 @@ static bool setting_append_list(
sizeof(settings->wifi.driver),
msg_hash_to_str(MENU_ENUM_LABEL_WIFI_DRIVER),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER),
config_get_default_camera(),
config_get_camera_driver_options(),
config_get_default_wifi(),
config_get_wifi_driver_options(),
&group_info,
&subgroup_info,
parent_group,