Fix potential crash and extra open page on initial help start.

Reviewed-by: ck
This commit is contained in:
kh1
2010-10-12 16:53:00 +02:00
parent 483d369c20
commit f707cfd834
2 changed files with 8 additions and 8 deletions

View File

@@ -797,17 +797,16 @@ HelpViewer* HelpPlugin::viewerForContextMode()
break;
}
HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (placeHolder && showSideBySide) {
RightPaneWidget::instance()->setShown(true);
createRightPaneContextViewer();
viewer = m_helpViewerForSideBar;
} else {
activateHelpMode();
if (!viewer)
viewer = OpenPagesManager::instance().createPage();
return m_helpViewerForSideBar;
}
activateHelpMode(); // should trigger an createPage...
HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (!viewer)
viewer = OpenPagesManager::instance().createPage();
return viewer;
}