Merge branch 'subtree'

[fanfix.git] / src / be / nikiroo / fanfix / library / LocalLibrary.java

diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/src/be/nikiroo/fanfix/library/LocalLibrary.java
index 3cf5a25bc232baddd6ed34df9faabbaa3d82281f..6720972682939785226de86a201ef2c4c4c7d68f 100644 (file)
--- a/src/be/nikiroo/fanfix/library/LocalLibrary.java
+++ b/src/be/nikiroo/fanfix/library/LocalLibrary.java
@@ -637,10 +637,13 @@ public class LocalLibrary extends BasicLibrary {
                }
 
                Map<MetaData, File[]> stories = this.stories;
-               synchronized (lock) {
-                       if (stories == null) {
-                               stories = getStoriesDo(pg);
-                               this.stories = stories;
+               if (stories == null) {
+                       stories = getStoriesDo(pg);
+                       synchronized (lock) {
+                               if (this.stories == null)
+                                       this.stories = stories;
+                               else
+                                       stories = this.stories;
                        }
                }
 
@@ -715,10 +718,6 @@ public class LocalLibrary extends BasicLibrary {
                }
 
                for (File infoFileOrSubdir : infoFilesAndSubdirs) {
-                       if (pgFiles != null) {
-                               pgFiles.setName(infoFileOrSubdir.getName());
-                       }
-
                        if (infoFileOrSubdir.isDirectory()) {
                                addToStories(stories, null, infoFileOrSubdir);
                        } else {