From afa6e978b9c74bcd013571a53aca47cbb8ca7b10 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 4 Nov 2003 23:37:53 +0000
Subject: fix AccessViolation bug (#835861)

---
 src/mesa/drivers/windows/gdi/wmesa.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/windows')

diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 01b08e85094..b923c999416 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.1 2003/07/24 03:47:46 kschultz Exp $ */
+/* $Id: wmesa.c,v 1.2 2003/11/04 23:37:53 brianp Exp $ */
 
 /*
  * Windows (Win32) device driver for Mesa 3.4
@@ -2247,7 +2247,14 @@ void RemoveContext(HWND hWnd)
 
 static LRESULT CALLBACK MyWndProc(HWND hwnd,UINT message,WPARAM wParam, LPARAM lParam)
 {
-	WMesaContext wc = Current->hwnd == hwnd ? Current : FindContext(hwnd);
+	WMesaContext wc;
+
+	if (Current==0 || Current->hwnd != hwnd)
+		wc=FindContext(hwnd);
+	else
+		wc=Current;
+
+
 	 if( wc )
 	 {
 		LRESULT lret = CallWindowProc((WNDPROC)(wc->oldWndProc),hwnd,message,wParam,lParam);
-- 
cgit v1.2.3