From 6f3bd48bd40bdc0777208aea2dcfd954c7b3a915 Mon Sep 17 00:00:00 2001 From: Rcmaniac25 Date: Fri, 24 Jan 2014 10:27:59 +0000 Subject: [PATCH 1/1] Prevented case where no window was set when waiting for events. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1656 7f0cb862-5218-0410-a997-914c9d46530a --- src/blackberry/fg_main_blackberry.c | 2 +- src/blackberry/fg_window_blackberry.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blackberry/fg_main_blackberry.c b/src/blackberry/fg_main_blackberry.c index f7b8f66..e347703 100644 --- a/src/blackberry/fg_main_blackberry.c +++ b/src/blackberry/fg_main_blackberry.c @@ -160,7 +160,7 @@ fg_time_t fgPlatformSystemTime ( void ) void fgPlatformSleepForEvents( fg_time_t msec ) { //XXX: Is this right? Is there a more direct way to access the context? - if(bps_get_event(&fgStructure.CurrentWindow->Window.pContext.event, (int)msec) != BPS_SUCCESS) { + if(fgStructure.CurrentWindow && bps_get_event(&fgStructure.CurrentWindow->Window.pContext.event, (int)msec) != BPS_SUCCESS) { LOGW("BPS couldn't get event"); } } diff --git a/src/blackberry/fg_window_blackberry.c b/src/blackberry/fg_window_blackberry.c index d435dfb..5201eb5 100644 --- a/src/blackberry/fg_window_blackberry.c +++ b/src/blackberry/fg_window_blackberry.c @@ -106,7 +106,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title, } /* Request window events */ - screen_request_events(window->Window.pContext.screenContext); + screen_request_events(window->Window.pContext.screenContext); //XXX When multiple screens are supported, this needs to be moved to wherever the screen context is actually created /* Save window and set state */ window->Window.Handle = fgDisplay.pDisplay.single_native_window; -- 1.7.10.4