From 85a169ff5080e5a3a6e511978f3a0a5b6a8b3f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Fri, 10 Jul 2020 00:03:53 +0200
Subject: [PATCH] X11: Fix cursor hover query retry behavior

XQueryPointer returns zero on BadWindow so the retry did not happen.

Related to ceb20c7f97994106db17cc66bd8abad331bc355e.

(cherry picked from commit 49dbcfcb8c5a0f16fc914a114c8d5cfc1a5f97c8)
---
 src/x11_window.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/x11_window.c b/src/x11_window.c
index 9ffb5e9e..90c4d9be 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -2601,11 +2601,9 @@ int _glfwPlatformWindowHovered(_GLFWwindow* window)
 
         if (_glfw.x11.errorCode == BadWindow)
             w = _glfw.x11.root;
-
-        if (!result)
+        else if (!result)
             return GLFW_FALSE;
-
-        if (w == window->x11.handle)
+        else if (w == window->x11.handle)
             return GLFW_TRUE;
     }