From d735ee65abec82ec8b9b7f33bb2e89fdd45d42cd Mon Sep 17 00:00:00 2001
From: Andrei Dmitriev <dav@openjdk.org>
Date: Tue, 7 Jun 2011 22:58:24 +0400
Subject: [PATCH] 7048568: Crash in
 Java_sun_awt_Win32GraphicsEnvironment_isVistaOS

Reviewed-by: dcherepanov, art, amenkov
---
 .../windows/native/sun/windows/awt_Win32GraphicsDevice.cpp  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
index 87519b4649d..ae268de1482 100644
--- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
@@ -673,6 +673,12 @@ LPMONITORINFO AwtWin32GraphicsDevice::GetMonitorInfo(int deviceIndex)
  */
 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++) {