From 7c3655ba5db474edc1fec87d0c6ef60fb898e262 Mon Sep 17 00:00:00 2001
From: Toad King <toadking@toadking.com>
Date: Sun, 8 Feb 2015 14:51:07 -0600
Subject: [PATCH] fix

---
 gfx/drivers_context/glx_ctx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
index 27633695b1..0270ea7e65 100644
--- a/gfx/drivers_context/glx_ctx.c
+++ b/gfx/drivers_context/glx_ctx.c
@@ -688,11 +688,11 @@ static gfx_ctx_proc_t gfx_ctx_glx_get_proc_address(const char *symbol)
 
 static void gfx_ctx_glx_make_current_context(void *data)
 {
-   gfx_ctx_glx_data_t *glx = (gfx_ctx_glx_data_t*)data;
+   gfx_ctx_glx_data_t *glx = (gfx_ctx_glx_data_t*)driver.video_context_data;
 
    if (glx)
       glXMakeContextCurrent(glx->g_dpy, glx->g_glx_win,
-            glx->g_glx_win, glx->g_hw_ctx);
+            glx->g_glx_win, glx->g_use_hw_ctx ? glx->g_hw_ctx : glx_g_ctx);
 }
 
 static bool gfx_ctx_glx_bind_api(void *data, enum gfx_ctx_api api,