Merge pull request #1096 from kiwix/Library_getArchive_doesnt_return_…

…null
kiwix · May 1, 2024 · 49858ff · 49858ff
2 parents 073dd06 + 0a42126
commit 49858ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/library.cpp b/src/library.cpp
@@ -60,7 +60,11 @@ QString Library::openBookFromPath(const QString &zimPath)
 
 std::shared_ptr<zim::Archive> Library::getArchive(const QString &zimId)
 {
-    return mp_library->getArchiveById(zimId.toStdString());
+    const auto archive =  mp_library->getArchiveById(zimId.toStdString());
+    if ( ! archive ) {
+        throw std::out_of_range("ZIM file doesn't exist (or cannot be opened)");
+    }
+    return archive;
 }
 
 std::shared_ptr<zim::Searcher> Library::getSearcher(const QString &zimId)

diff --git a/src/readinglistbar.cpp b/src/readinglistbar.cpp
@@ -39,9 +39,6 @@ void ReadingListBar::setupList()
         } catch (std::out_of_range& e) {
             continue;
         }
-        if ( !archive ) {
-            continue;
-        }
         try {
             auto illustration = archive->getIllustrationItem(48);
             std::string content = illustration.getData();