From 4994c48172e94ca81c000597e0abc0ea0e682b3c Mon Sep 17 00:00:00 2001
From: Yaroslav Isakov <yaroslav.isakov@gmail.com>
Date: Wed, 29 Jul 2020 22:29:50 +0200
Subject: Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded
 already

Reviewed-by: Adam Jackson <ajax@redhat.com>

Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
---
 src/dispatch_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index cfc9dcc..62b7134 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -677,7 +677,8 @@ epoxy_load_gl(void)
     if (!api.gl_handle) {
 	get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
 #if PLATFORM_HAS_GLX
-	api.glx_handle = api.gl_handle;
+        if (!api.glx_handle)
+	    api.glx_handle = api.gl_handle;
 #endif
     }
 #endif
-- 
cgit v1.2.1