mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 06:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
radius 2019-03-13 12:39:27 -05:00
parent 0c2f5093b2
commit 2acfe9cb6a
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration.c
View File

@ -1589,16 +1589,13 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("playlist_sort_alphabetical", &settings->bools.playlist_sort_alphabetical, true, playlist_sort_alphabetical, false);
SETTING_BOOL("quit_press_twice", &settings->bools.quit_press_twice, true, quit_press_twice, false);
<<<<<<< HEAD
SETTING_BOOL("vibrate_on_keypress", &settings->bools.vibrate_on_keypress, true, vibrate_on_keypress, false);
SETTING_BOOL("enable_device_vibration", &settings->bools.enable_device_vibration, true, enable_device_vibration, false);
#ifdef HAVE_OZONE
SETTING_BOOL("ozone_collapse_sidebar", &settings->bools.ozone_collapse_sidebar, true, ozone_collapse_sidebar, false);
#endif
=======
SETTING_BOOL("log_to_file", &settings->bools.log_to_file, true, default_log_to_file, false);
>>>>>>> add log to file settings
*size = count;

3
configuration.h
View File

@ -315,16 +315,13 @@ typedef struct settings
bool playlist_show_sublabels;
bool quit_press_twice;
<<<<<<< HEAD
bool vibrate_on_keypress;
bool enable_device_vibration;
#ifdef HAVE_OZONE
bool ozone_collapse_sidebar;
#endif
=======
bool log_to_file;
>>>>>>> add log to file settings
} bools;
struct