Mercurial > hg > openjdk > jdk7 > jdk

changeset 4293:f08fcae94813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Fri, 10 Jun 2011 11:43:15 -0700
parents 7a341c412ea9 (current diff) ae731399e525 (diff)
children 646ab254ff80
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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++) {