--- a/src/video/windows/SDL_windowswindow.c	Mon Jul 25 15:03:42 2011 -0700
+++ b/src/video/windows/SDL_windowswindow.c	Wed Jul 27 18:07:40 2011 -0400
@@ -640,9 +640,11 @@
             /* Restore any original event handler... */
             if (data->wndproc != NULL) {
 #ifdef GWLP_WNDPROC
-                SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) data->wndproc);
+                SetWindowLongPtr(data->hwnd, GWLP_WNDPROC,
+                                 (LONG_PTR) data->wndproc);
 #else
-                SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR) data->wndproc);
+                SetWindowLong(data->hwnd, GWL_WNDPROC,
+                              (LONG_PTR) data->wndproc);
 #endif
             }
         }