From 2f4bd3dde6891ee873bc3c23d7a6b32f3220a8a4 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 25 May 2011 11:07:26 +0200 Subject: [PATCH] Fixed issue sankore-33 --- src/board/UBLibraryController.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 74541a8d..603e5092 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -322,9 +322,9 @@ QList UBLibraryController::addVirtualElementsForItemPath(const QS { QList content; if (pPath == mInteractiveUserDirectoryPath.toLocalFile()){ - content << mInternalLibElements; content << listElementsInPath(UBSettings::settings()->uniboardInteractiveLibraryDirectory()); content << listElementsInPath(UBSettings::settings()->uniboardInteractiveFavoritesDirectory()); + content << mInternalLibElements; } else if (pPath == mPicturesStandardDirectoryPath.toLocalFile()){ QUrl path = QUrl::fromLocalFile(UBSettings::settings()->uniboardImageLibraryDirectory()); @@ -337,7 +337,7 @@ QList UBLibraryController::addVirtualElementsForItemPath(const QS QList UBLibraryController::listElementsInPath(const QString& pPath) { - QList content = addVirtualElementsForItemPath(pPath); + QList content; QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(pPath); QFileInfoList::iterator fileInfo; @@ -365,6 +365,7 @@ QList UBLibraryController::listElementsInPath(const QString& pPat } content << element; } + content << addVirtualElementsForItemPath(pPath); return content; }