Commit 7b8d670b authored by Eike Ziller's avatar Eike Ziller

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: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent b9ea4843
......@@ -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();
}
}
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment