From 9add728945e8b9ec5880dad5bbd7d2871a9c5f72 Mon Sep 17 00:00:00 2001
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Date: Thu, 9 Jul 2026 19:00:43 +0200
Subject: [PATCH] Don't track fullscreen mode

SDL already does it.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
 source/ps/VideoMode.cpp | 15 ++++++---------
 source/ps/VideoMode.h   |  3 ---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp
index 5d5b4d8755..6748bc72b3 100644
--- a/source/ps/VideoMode.cpp
+++ b/source/ps/VideoMode.cpp
@@ -293,7 +293,7 @@ Input::Reaction CVideoMode::InputHandler::operator()(const SDL_Event& ev)
 			return Input::Reaction::HANDLED;
 		}
 	}
-	if (ev.type == SDL_WINDOWEVENT && !videoMode.m_IsFullscreen)
+	if (ev.type == SDL_WINDOWEVENT && !videoMode.IsInFullscreen())
 	{
 		switch (ev.window.event)
 		{
@@ -509,7 +509,7 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen)
 	}
 	else
 	{
-		if (m_IsFullscreen != fullscreen)
+		if (IsInFullscreen() != fullscreen)
 		{
 			if (!fullscreen)
 			{
@@ -548,8 +548,6 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen)
 	else
 		SDL_SetWindowGrab(m_Window, SDL_FALSE);
 
-	m_IsFullscreen = fullscreen;
-
 	return true;
 }
 
@@ -647,7 +645,6 @@ void CVideoMode::Shutdown()
 
 	m_Cursor.reset();
 
-	m_IsFullscreen = false;
 	m_IsInitialised = false;
 
 	if (m_BackendDevice)
@@ -805,10 +802,10 @@ bool CVideoMode::SetFullscreen(bool fullscreen)
 		return false;
 
 	// Check whether this is actually a change
-	if (fullscreen == m_IsFullscreen)
+	if (fullscreen == IsInFullscreen())
 		return true;
 
-	if (!m_IsFullscreen)
+	if (!IsInFullscreen())
 	{
 		// Windowed -> fullscreen:
 
@@ -860,12 +857,12 @@ bool CVideoMode::SetFullscreen(bool fullscreen)
 
 bool CVideoMode::ToggleFullscreen()
 {
-	return SetFullscreen(!m_IsFullscreen);
+	return SetFullscreen(!IsInFullscreen());
 }
 
 bool CVideoMode::IsInFullscreen() const
 {
-	return m_IsFullscreen;
+	return SDL_GetWindowFlags(m_Window) & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP);
 }
 
 void CVideoMode::UpdateRenderer(int w, int h)
diff --git a/source/ps/VideoMode.h b/source/ps/VideoMode.h
index db1c82b3d3..136350fc94 100644
--- a/source/ps/VideoMode.h
+++ b/source/ps/VideoMode.h
@@ -173,9 +173,6 @@ private:
 	int m_WindowedX;
 	int m_WindowedY;
 
-	// Whether we're currently being displayed fullscreen
-	bool m_IsFullscreen = false;
-
 	// The last mode selected
 	int m_CurrentW;
 	int m_CurrentH;