From 4c121563fb3300f7c9df80a9f2573729bc6ea683 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Thu, 23 Jul 2015 15:12:32 +0300
Subject: [PATCH] 8131752: [Regression] Test
 java/awt/GraphicsDevice/CheckDisplayModes.java fails

Reviewed-by: alexsch, serb
---
 jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index f24df1fd216..56b4252f761 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -316,6 +316,7 @@ public final class X11GraphicsDevice extends GraphicsDevice
     @Override
     public boolean isDisplayChangeSupported() {
         return (isFullScreenSupported()
+                && (getFullScreenWindow() != null)
                 && !((X11GraphicsEnvironment) GraphicsEnvironment
                         .getLocalGraphicsEnvironment()).runningXinerama());
     }