# HG changeset patch # User dav # Date 1307473104 -14400 # Node ID ae731399e525fe98fac7d7871b5db3f18ac035c0 # Parent 39de8937c1d854cd625466afd1383a0913aacd3a 7048568: Crash in Java_sun_awt_Win32GraphicsEnvironment_isVistaOS Reviewed-by: dcherepanov, art, amenkov diff -r 39de8937c1d8 -r ae731399e525 src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp --- a/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Thu Jun 02 13:38:28 2011 -0700 +++ b/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Tue Jun 07 22:58:24 2011 +0400 @@ -673,6 +673,12 @@ */ void AwtWin32GraphicsDevice::ResetAllMonitorInfo() { + //IE in some circumstances generates WM_SETTINGCHANGE message on appearance + //and thus triggers this method + //but we may not have the devices list initialized yet. + if (!Devices::GetInstance()){ + return; + } Devices::InstanceAccess devices; int devicesNum = devices->GetNumDevices(); for (int deviceIndex = 0; deviceIndex < devicesNum; deviceIndex++) {