From 47e5d7c2dd0df8ef4165905597e39aec51aeb386 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Mon, 21 Feb 2011 15:08:36 -0800
Subject: [PATCH] Do error checking in SDL_GetDisplayForWindow()

---
 src/video/SDL_video.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 4378861ea..3548f9bde 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -888,7 +888,7 @@ SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode *
 }
 
 int
-SDLCALL SDL_GetWindowDisplay(SDL_Window * window)
+SDL_GetWindowDisplay(SDL_Window * window)
 {
     int displayIndex;
     int i, dist;
@@ -945,7 +945,12 @@ SDLCALL SDL_GetWindowDisplay(SDL_Window * window)
 SDL_VideoDisplay *
 SDL_GetDisplayForWindow(SDL_Window *window)
 {
-    return &_this->displays[SDL_GetWindowDisplay(window)];
+    int displayIndex = SDL_GetWindowDisplay(window);
+    if (displayIndex >= 0) {
+        return &_this->displays[displayIndex];
+    } else {
+        return NULL;
+    }
 }
 
 int