EGL more query config trials; Avoid NPE if no config is chosen

1 files changed, 2 insertions, 2 deletions

diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java
index f88632476..47f02c7cc 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java
@@ -57,11 +57,11 @@ public class DefaultGraphicsConfiguration implements Cloneable, AbstractGraphics
     }
 
     public Capabilities getChosenCapabilities() {
-        return (Capabilities)capabilitiesChosen.clone();
+        return (null!=capabilitiesChosen)?(Capabilities)capabilitiesChosen.clone():null;
     }
 
     public Capabilities getRequestedCapabilities() {
-        return (Capabilities)capabilitiesRequested.clone();
+        return (null!=capabilitiesRequested)?(Capabilities)capabilitiesRequested.clone():null;
     }
 
     public AbstractGraphicsConfiguration getNativeGraphicsConfiguration() {