From 14e007772ac6f23f02dd750922b6e8cb5a2174ab Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 21 Apr 2015 10:14:17 -0400
Subject: [PATCH] x11: window managers might mark windows as FULLSCREEN _and_
 MAXIMIZED.

This patch came from Unreal Engine 4's fork of SDL, compliments of Epic Games.
---
 src/video/x11/SDL_x11window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 93f6795b2..ab0f03d48 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -207,7 +207,9 @@ X11_GetNetWMState(_THIS, Window xwindow)
         }
         if (maximized == 3) {
             flags |= SDL_WINDOW_MAXIMIZED;
-        }  else if (fullscreen == 1) {
+        }
+
+        if (fullscreen == 1) {
             flags |= SDL_WINDOW_FULLSCREEN;
         }
         X11_XFree(propertyValue);