From bc61a81d7a7ff735021c40a8493d5eda5b6c6152 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 23 Jul 2020 23:57:03 +0200
Subject: [PATCH] GLFW: X11: Fix joystick detection before joystick init

From upstream: https://github.com/glfw/glfw/commit/c01acc267ad7f5e016d905276ba38917a1fa64bb.
---
 glfw/x11_window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index f8dce617f..1aebae797 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2653,7 +2653,8 @@ _glfwDispatchX11Events(void) {
     unsigned dispatched = 0;
 
 #if defined(__linux__)
-    _glfwDetectJoystickConnectionLinux();
+    if (_glfw.joysticksInitialized)
+        _glfwDetectJoystickConnectionLinux();
 #endif
     dispatched += dispatch_x11_queued_events(XEventsQueued(_glfw.x11.display, QueuedAfterFlush));