Merge remote-tracking branch 'origin/KDE/4.14'

12 years ago · ee8b442559
parent d3fc62787b b958a5e3ae
commit ee8b442559
1 changed files with 1 additions and 1 deletions
--- a/part.cpp
+++ b/part.cpp
@ -1448,7 +1448,7 @@ bool Part::openFile()
    }

    // if the 'OpenTOC' flag is set, open the TOC
-    if ( m_document->metaData( "OpenTOC" ).toBool() && m_sidebar->isItemEnabled( 0 ) && !m_sidebar->isCollapsed() )
+    if ( m_document->metaData( "OpenTOC" ).toBool() && m_sidebar->isItemEnabled( 0 ) && !m_sidebar->isCollapsed() && m_sidebar->currentIndex() != 0 )
    {
        m_sidebar->setCurrentIndex( 0, Sidebar::DoNotUncollapseIfCollapsed );
    }