mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(configuration.c) Rearrange

Browse Source
This commit is contained in:
twinaphex 2016-07-24 10:49:38 +02:00
parent ab1292ddda
commit 0a959ab047
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configuration.c
View File

@ -1790,8 +1790,6 @@ static bool config_load_file(const char *path, bool set_defaults)
#endif #endif
/* Post-settings load */ /* Post-settings load */
if (string_is_equal(settings->path.menu_wallpaper, "default"))
*settings->path.menu_wallpaper = '\0';
if (settings->video.hard_sync_frames > 3) if (settings->video.hard_sync_frames > 3)
settings->video.hard_sync_frames = 3; settings->video.hard_sync_frames = 3;
@ -1802,14 +1800,6 @@ static bool config_load_file(const char *path, bool set_defaults)
settings->video.swap_interval = MAX(settings->video.swap_interval, 1); settings->video.swap_interval = MAX(settings->video.swap_interval, 1);
settings->video.swap_interval = MIN(settings->video.swap_interval, 4); settings->video.swap_interval = MIN(settings->video.swap_interval, 4);
if (string_is_equal(settings->directory.video_shader, "default"))
*settings->directory.video_shader = '\0';
if (string_is_equal(settings->directory.video_filter, "default"))
*settings->directory.video_filter = '\0';
if (string_is_equal(settings->directory.audio_filter, "default"))
*settings->directory.audio_filter = '\0';
audio_driver_set_volume_gain(db_to_gain(settings->audio.volume)); audio_driver_set_volume_gain(db_to_gain(settings->audio.volume));
@ -1895,6 +1885,14 @@ static bool config_load_file(const char *path, bool set_defaults)
*settings->path.libretro = '\0'; *settings->path.libretro = '\0';
} }
if (string_is_equal(settings->path.menu_wallpaper, "default"))
*settings->path.menu_wallpaper = '\0';
if (string_is_equal(settings->directory.video_shader, "default"))
*settings->directory.video_shader = '\0';
if (string_is_equal(settings->directory.video_filter, "default"))
*settings->directory.video_filter = '\0';
if (string_is_equal(settings->directory.audio_filter, "default"))
*settings->directory.audio_filter = '\0';
if (string_is_equal(settings->directory.core_assets, "default")) if (string_is_equal(settings->directory.core_assets, "default"))
*settings->directory.core_assets = '\0'; *settings->directory.core_assets = '\0';
if (string_is_equal(settings->directory.assets, "default")) if (string_is_equal(settings->directory.assets, "default"))