From a565f792a4142d6e3720f7fddd1bcba625d10272 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 19 Sep 2013 12:41:02 +0200
Subject: [PATCH] Video fullscreen toggle - mutation of g_settings now done
 through settings_set

---
 general.h   | 1 +
 retroarch.c | 2 +-
 settings.c  | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/general.h b/general.h
index 9930af8898..084e5624eb 100644
--- a/general.h
+++ b/general.h
@@ -657,6 +657,7 @@ enum
    S_INPUT_OVERLAY_SCALE_DECREMENT,
    S_INPUT_OVERLAY_SCALE_INCREMENT,
    S_VIDEO_VSYNC_TOGGLE,
+   S_VIDEO_FULLSCREEN_TOGGLE,
    S_REWIND_GRANULARITY_DECREMENT,
    S_REWIND_GRANULARITY_INCREMENT,
    S_DEF_REWIND_GRANULARITY,
diff --git a/retroarch.c b/retroarch.c
index 42a7dd9e4f..53de899ae8 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2006,7 +2006,7 @@ static bool check_fullscreen(void)
    bool toggle = pressed && !was_pressed;
    if (toggle)
    {
-      g_settings.video.fullscreen = !g_settings.video.fullscreen;
+      settings_set(1ULL << S_VIDEO_FULLSCREEN_TOGGLE);
       rarch_set_fullscreen(g_settings.video.fullscreen);
    }
 
diff --git a/settings.c b/settings.c
index d375437986..351141ebb3 100644
--- a/settings.c
+++ b/settings.c
@@ -1187,6 +1187,9 @@ void settings_set(uint64_t settings)
    if (settings & (1ULL << S_VIDEO_VSYNC_TOGGLE))
       g_settings.video.vsync = !g_settings.video.vsync;
 
+   if (settings & (1ULL << S_VIDEO_FULLSCREEN_TOGGLE))
+      g_settings.video.fullscreen = !g_settings.video.fullscreen;
+
    if (settings & (1ULL << S_DEF_VIDEO_VSYNC))
       g_settings.video.vsync = true;