# HG changeset patch # User lana # Date 1307731395 25200 # Node ID f08fcae94813ec3085a7b18a69a15bf6031d2e31 # Parent 7a341c412ea9ef4aef34aab67ee04bebfd80c8ff# Parent ae731399e525fe98fac7d7871b5db3f18ac035c0 Merge diff -r 7a341c412ea9 -r f08fcae94813 src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp --- a/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Tue Jun 07 14:01:12 2011 -0700 +++ b/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Fri Jun 10 11:43:15 2011 -0700 @@ -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++) {