From 26b5484a6e7523b473e07e800896951d339bf036 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Fri, 22 May 2015 16:53:20 -0400 Subject: [PATCH] ecere/gui/drivers/Win32Interface: Fixed crashes on null objects --- ecere/src/gui/drivers/Win32Interface.ec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecere/src/gui/drivers/Win32Interface.ec b/ecere/src/gui/drivers/Win32Interface.ec index a68e6e8..ab813ed 100644 --- a/ecere/src/gui/drivers/Win32Interface.ec +++ b/ecere/src/gui/drivers/Win32Interface.ec @@ -539,7 +539,7 @@ class Win32Interface : Interface { Window master = window.master; Window rootWindow = master.rootWindow; - if(rootWindow.displaySystem && rootWindow.displaySystem.driver == class(OpenGLDisplayDriver)) + if(rootWindow && rootWindow.displaySystem && rootWindow.displaySystem.driver == class(OpenGLDisplayDriver)) windowLong = (void *)ApplicationWindow; } #endif @@ -1922,7 +1922,7 @@ class Win32Interface : Interface // WARNING -- putting this here as it is right after CreateRootWindow // Take out Layered flag if we're not in 24 bit { - if(window.alphaBlend && window.display.pixelFormat != pixelFormat888) + if(window.alphaBlend && window.display && window.display.pixelFormat != pixelFormat888) { #ifndef ECERE_NOBLENDING DWORD style = GetWindowLong(window.windowHandle, GWL_EXSTYLE); -- 1.8.3.1