feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/help/helpplugin.cpp
View File

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

3
src/plugins/help/openpagesmanager.cpp
View File

@@ -177,7 +177,8 @@ void OpenPagesManager::setupInitialPages()
CentralWidget::instance()->addPage(m_model->pageAt(i)); CentralWidget::instance()->addPage(m_model->pageAt(i));
emit pagesChanged(); emit pagesChanged();
setCurrentPage(initialPage); setCurrentPage((initialPage >= m_model->rowCount())
? m_model->rowCount() - 1 : initialPage);
m_openPagesSwitcher->selectCurrentPage(); m_openPagesSwitcher->selectCurrentPage();
} }