Fix NullPointerException when preference directory is removed

aleksandarstojkovski · Jun 9, 2019 · 1243762 · 1243762
1 parent 91839fe
commit 1243762
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/ch/picturex/controller/MainController.java b/src/main/java/ch/picturex/controller/MainController.java
@@ -101,7 +101,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         setSearchBarListener(globingTextField);
 
         //alla partenza se il programma è già stato usato fa partire tutto dall'ultimo path
-        if (getLastDirectoryPreferences() != null && getLastDirectoryPreferences().canRead()) {
+        if (getLastDirectoryPreferences() != null) {
             chosenDirectory = getLastDirectoryPreferences();
             directoryChosenAction();
         } else {
@@ -328,7 +328,10 @@ private File getLastDirectoryPreferences() {
         Preferences preference = Preferences.userNodeForPackage(Model.class);
         String filePath = preference.get("directory", null);
         if (filePath != null) {
-            return new File(filePath);
+            File file = new File(filePath);
+            if (file.canRead()) {
+                return file;
+            }
         }
         return null;
     }