From 322c86e3a2b6b0c1355fb90130e85066b7f79527 Mon Sep 17 00:00:00 2001
From: Knut Forkalsrud <knut@forkalsrud.org>
Date: Sat, 4 Jan 2014 17:19:22 -0800
Subject: [PATCH] Deal better with empty directories.

---
 src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
index e0ece27..cb9488a 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
@@ -182,7 +182,6 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
                 boolean hidden = Boolean.parseBoolean(props.getProperty("dir." + name + ".hidden"));
                 if (!hidden) {
                     DirectoryEntry dir = new DirectoryEntry(services, this, new File(file, name));
-                    children.add(dir);
                     if (name != null && name.equals(coverFileName)) {
                         setThumbnail(dir.getThumbnail());
                     }
@@ -191,6 +190,9 @@ public class DirectoryEntry extends EntryWithChildren<Entry> {
                         oldest = fileDate;
                     }
                     dir.setCaption(props.getProperty("dir." + name + ".caption"));
+                    if (!dir.getContents().isEmpty()) {
+                        children.add(dir);
+                    }
                 }
             }
         }