[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27563] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Fix [#21634] GHOST_WindowCocoa: activeWindow null pointer check
Damien Plisson
damien.plisson at yahoo.fr
Tue Mar 16 21:42:12 CET 2010
Revision: 27563
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27563
Author: damien78
Date: 2010-03-16 21:42:12 +0100 (Tue, 16 Mar 2010)
Log Message:
-----------
Fix [#21634] GHOST_WindowCocoa: activeWindow null pointer check
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-16 19:36:10 UTC (rev 27562)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-03-16 20:42:12 UTC (rev 27563)
@@ -774,15 +774,17 @@
GHOST_TSuccess GHOST_SystemCocoa::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual)
{
GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
-
*window = currentWindow;
+ if(!currentWindow) return GHOST_kFailure;
+
return currentWindow->setState(GHOST_kWindowStateFullScreen);
}
GHOST_TSuccess GHOST_SystemCocoa::endFullScreen(void)
{
GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
+ if(!currentWindow) return GHOST_kFailure;
return currentWindow->setState(GHOST_kWindowStateNormal);
}
@@ -809,6 +811,8 @@
{
float xf=(float)x, yf=(float)y;
GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
+ if (!window) return GHOST_kFailure;
+
NSScreen *windowScreen = window->getScreen();
NSRect screenRect = [windowScreen frame];
More information about the Bf-blender-cvs
mailing list