From 6d16d7386d438aaee0a8e75bdf7c8c2ed14b6b15 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Sun, 30 Jan 2022 19:32:04 +0400
Subject: [PATCH] Changed the signature of ContentResponse::set_taskbar()

---
 src/server/internalServer.cpp | 2 +-
 src/server/response.cpp       | 6 +++---
 src/server/response.h         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index d11f86482..569fe2c13 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -816,7 +816,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
     }
     auto response = ItemResponse::build(*this, request, entry.getItem());
     try {
-      dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, getArchiveTitle(*archive));
+      dynamic_cast<ContentResponse&>(*response).set_taskbar(bookName, archive.get());
     } catch (std::bad_cast& e) {}
 
     if (m_verbose.load()) {
diff --git a/src/server/response.cpp b/src/server/response.cpp
index 0310c8870..94f5df0b5 100644
--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -333,10 +333,10 @@ MHD_Result Response::send(const RequestContext& request, MHD_Connection* connect
   return ret;
 }
 
-void ContentResponse::set_taskbar(const std::string& bookName, const std::string& bookTitle)
+void ContentResponse::set_taskbar(const std::string& bookName, const zim::Archive* archive)
 {
   m_bookName = bookName;
-  m_bookTitle = bookTitle;
+  m_bookTitle = archive ? getArchiveTitle(*archive) : "";
 }
 
 
@@ -389,7 +389,7 @@ std::unique_ptr<ContentResponse> withTaskbarInfo(
   const zim::Archive* archive,
   std::unique_ptr<ContentResponse> r)
 {
-  r->set_taskbar(bookName, archive ? getArchiveTitle(*archive) : "");
+  r->set_taskbar(bookName, archive);
   return r;
 }
 
diff --git a/src/server/response.h b/src/server/response.h
index 744afd25a..e464ca54c 100644
--- a/src/server/response.h
+++ b/src/server/response.h
@@ -104,7 +104,7 @@ class ContentResponse : public Response {
       const std::string& mimetype,
       bool isHomePage = false);
 
-    void set_taskbar(const std::string& bookName, const std::string& bookTitle);
+    void set_taskbar(const std::string& bookName, const zim::Archive* archive);
 
   private:
     MHD_Response* create_mhd_response(const RequestContext& request);