From 09caa36067de68b03ab9c18ad18a4ba1b5ce5bdf Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Mon, 3 Mar 2003 21:58:17 +0000 Subject: [PATCH] fix: possible NPE evaded --- src/java/org/lwjgl/Display.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/lwjgl/Display.java b/src/java/org/lwjgl/Display.java index 3bdde97f..4bc34b4f 100644 --- a/src/java/org/lwjgl/Display.java +++ b/src/java/org/lwjgl/Display.java @@ -80,14 +80,14 @@ public final class Display { */ public static DisplayMode[] getAvailableDisplayModes() { DisplayMode[] unfilteredModes = nGetAvailableDisplayModes(); - - // We'll use a HashSet to filter out the duplicated modes - HashSet modes = new HashSet(unfilteredModes.length); - + if (unfilteredModes == null) { return new DisplayMode[0]; } + // We'll use a HashSet to filter out the duplicated modes + HashSet modes = new HashSet(unfilteredModes.length); + modes.addAll(Arrays.asList(unfilteredModes)); DisplayMode[] filteredModes = new DisplayMode[modes.size()]; modes.toArray(filteredModes);