Merge
authorlana
Fri, 10 Jun 2011 11:43:15 -0700
changeset 9822 8041d9891573
parent 9820 df4b57d5e6a9 (current diff)
parent 9821 359a643a641b (diff)
child 9825 e2a4f9e5c719
Merge
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp	Tue Jun 07 14:01:12 2011 -0700
+++ b/jdk/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++) {