From 9d9d7b1deef8b4330e29b5f601fbba93b6374fd8 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 21 Jul 2006 19:52:59 +0000
Subject: [PATCH] check for non-nill pwc in WMesaMakeCurrent(), bug 7585

---
 src/mesa/drivers/windows/gdi/wmesa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 8e861da5081..8dbd6f836a5 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1321,7 +1321,7 @@ void WMesaMakeCurrent(WMesaContext c, HDC hdc)
         /* return if already current */
         GET_CURRENT_CONTEXT(ctx);
         WMesaContext pwc = wmesa_context(ctx);
-        if (c == pwc && pwc->hDC == hdc)
+        if (pwc && c == pwc && pwc->hDC == hdc)
             return;
     }
 
-- 
2.30.2