Mercurial > hg > openjdk > jdk7 > jdk

changeset 4292:ae731399e525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7048568: Crash in Java_sun_awt_Win32GraphicsEnvironment_isVistaOS Reviewed-by: dcherepanov, art, amenkov
author dav
date Tue, 07 Jun 2011 22:58:24 +0400
parents 39de8937c1d8
children f08fcae94813
files src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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++) {