From 22b756753a7cebde4f178b750b6ec2ea65519a27 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 3 Feb 2019 20:09:18 +0530
Subject: [PATCH] X11: Fix EWMH state update for hidden windows

From upstream: https://github.com/glfw/glfw/commit/78e6a0063d27ed44c2c4805606309744f6fb29fc
---
 glfw/x11_window.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index 28c6da2ca..fa3a5b609 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2253,16 +2253,20 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
 
     _glfwInputWindowMonitor(window, monitor);
     updateNormalHints(window, width, height);
-    updateWindowMode(window);
 
     if (window->monitor)
     {
-        XMapRaised(_glfw.x11.display, window->x11.handle);
-        if (waitForVisibilityNotify(window))
-            acquireMonitor(window);
+       if (!_glfwPlatformWindowVisible(window))
+       {
+           XMapRaised(_glfw.x11.display, window->x11.handle);
+           waitForVisibilityNotify(window);
+       }
+       updateWindowMode(window);
+       acquireMonitor(window);
     }
     else
     {
+        updateWindowMode(window);
         XMoveResizeWindow(_glfw.x11.display, window->x11.handle,
                           xpos, ypos, width, height);
     }