From 8fdbcc86736daf07975775af79803c6e3dfd4abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sat, 2 Jul 2016 22:52:42 +0300 Subject: [PATCH] Fixed|Resources|libdoomsday: Sidecar manifest files not found If the file system was still being populated while data files were being identified, the folder contents may not have been fully present yet. --- doomsday/apps/libdoomsday/src/resource/bundles.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doomsday/apps/libdoomsday/src/resource/bundles.cpp b/doomsday/apps/libdoomsday/src/resource/bundles.cpp index 97b5a7f480..b3717e165c 100644 --- a/doomsday/apps/libdoomsday/src/resource/bundles.cpp +++ b/doomsday/apps/libdoomsday/src/resource/bundles.cpp @@ -54,7 +54,7 @@ DENG2_PIMPL(Bundles) App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFolder)).audienceForAddition() += this; App::fileSystem().indexFor(DENG2_TYPE_NAME(DataFolder)).audienceForRemoval() += this; } - + ~Instance() { // Ongoing identification tasks should first finish. @@ -100,6 +100,8 @@ DENG2_PIMPL(Bundles) bool identifyAddedDataBundles() { + Folder::waitForPopulation(); + DENG2_ASSERT(App::rootFolder().has("/sys/bundles")); bool wasIdentified = false;