From 7b8d670bd83cd0312573f91b0f6e406614b15b1a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 2 Apr 2015 10:25:46 +0200 Subject: [PATCH] Help: Fix that bookmarks were not restored We have to make sure that the help engine is properly set up before trying to read the bookmark data. Change-Id: Id57cce5f538472eeac17b39a3640bf2ed77fa56a Task-number: QTCREATORBUG-14106 Reviewed-by: Eike Ziller --- src/plugins/help/helpplugin.cpp | 2 ++ src/plugins/help/localhelpmanager.cpp | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 5915c9f1022..2ad2dbcbe0c 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -30,6 +30,7 @@ #include "helpplugin.h" +#include "bookmarkmanager.h" #include "centralwidget.h" #include "docsettingspage.h" #include "filtersettingspage.h" @@ -668,6 +669,7 @@ void HelpPlugin::doSetupIfNeeded() resetFilter(); m_setupNeeded = false; OpenPagesManager::instance().setupInitialPages(); + LocalHelpManager::bookmarkManager().setupBookmarkModels(); } } diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 3603d6fbb8d..96508149e75 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -140,10 +140,8 @@ BookmarkManager& LocalHelpManager::bookmarkManager() { if (!m_bookmarkManager) { QMutexLocker _(&m_bkmarkMutex); - if (!m_bookmarkManager) { + if (!m_bookmarkManager) m_bookmarkManager = new BookmarkManager; - m_bookmarkManager->setupBookmarkModels(); - } } return *m_bookmarkManager; }