From 82581c846101bd2086d4ff1a386f548be67fbfb0 Mon Sep 17 00:00:00 2001 From: twinaphex <libretro@gmail.com> Date: Mon, 29 Aug 2016 21:09:18 +0200 Subject: [PATCH] Cleanup --- configuration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.c b/configuration.c index ffd15a9975..07b6f0d38f 100644 --- a/configuration.c +++ b/configuration.c @@ -689,7 +689,7 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti SETTING_BOOL("custom_bgm_enable", &global->console.sound.system_bgm_enable, false, false /* TODO */); SETTING_BOOL("auto_screenshot_filename", &settings->auto_screenshot_filename, true, auto_screenshot_filename); SETTING_BOOL("video_force_srgb_disable", &settings->video.force_srgb_disable, true, false); - SETTING_BOOL("video_fullscreen", &settings->video.fullscreen, false, false /* TODO */); + SETTING_BOOL("video_fullscreen", &settings->video.fullscreen, true, fullscreen); SETTING_BOOL("bundle_assets_extract_enable", &settings->bundle_assets_extract_enable, true, bundle_assets_extract_enable); SETTING_BOOL("video_vsync", &settings->video.vsync, true, vsync); SETTING_BOOL("video_hard_sync", &settings->video.hard_sync, true, hard_sync); @@ -1002,7 +1002,6 @@ static void config_set_defaults(void) settings->multimedia.builtin_mediaplayer_enable = false; #endif settings->video.scale = scale; - settings->video.fullscreen = rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL) ? true : fullscreen; settings->video.windowed_fullscreen = windowed_fullscreen; settings->video.monitor_index = monitor_index; settings->video.fullscreen_x = fullscreen_x; @@ -1012,6 +1011,9 @@ static void config_set_defaults(void) settings->video.frame_delay = frame_delay; settings->video.swap_interval = swap_interval; + if (rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL)) + settings->video.fullscreen = true; + if (g_defaults.settings.video_threaded_enable != video_threaded) settings->video.threaded = g_defaults.settings.video_threaded_enable;