From d859337e12f3b2467f840a67de51ea9ef876fa8e Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 25 Feb 2018 14:02:47 -0500 Subject: [PATCH] [fix] prevent a NPE if openrocket does not detect the example files --- .../net/sf/openrocket/gui/main/ExampleDesignFile.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java index d697f042b..e7fa03d33 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java +++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java @@ -50,11 +50,14 @@ public class ExampleDesignFile implements Comparable { logger.debug("Cannot find jar file, trying to load from directory"); designs = getDirFileNames(); } - if (designs == null || designs.length == 0) { - return null; + + if (designs == null ){ + return new ExampleDesignFile[0]; + } + + if( 0 < designs.length ) { + Arrays.sort(designs); } - - Arrays.sort(designs); return designs; }