1 files changed, 9 insertions, 4 deletions
diff --git a/src/index.cpp b/src/index.cpp
index 3706bbf..8e5f266 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1579,8 +1579,8 @@ static void writeAnnotatedClassList(OutputList &ol)
 {
   //LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::ClassList);
   //bool addToIndex = lne==0 || lne->visible();
+  bool first=TRUE;
 
-  ol.startIndexList();
   ClassSDict::Iterator cli(*Doxygen::classSDict);
   ClassDef *cd;
 
@@ -1593,6 +1593,11 @@ static void writeAnnotatedClassList(OutputList &ol)
     {
       continue;
     }
+    if (first)
+    {
+      ol.startIndexList();
+      first=FALSE;
+    }
 
     ol.pushGeneratorState();
     if (cd->isEmbeddedInOuterScope())
@@ -1635,7 +1640,7 @@ static void writeAnnotatedClassList(OutputList &ol)
     }
     ol.popGeneratorState();
   }
-  ol.endIndexList();
+  if (!first) ol.endIndexList();
 }
 
 inline bool isId1(int c)
@@ -3883,9 +3888,9 @@ static void writeIndex(OutputList &ol)
   if (Doxygen::mainPage)
   {
     Doxygen::insideMainPage=TRUE;
-    if (Doxygen::mainPage->showToc() && Doxygen::mainPage->hasSections())
+    if (Doxygen::mainPage->localToc().isHtmlEnabled() && Doxygen::mainPage->hasSections())
     {
-      Doxygen::mainPage->writeToc(ol);
+      Doxygen::mainPage->writeToc(ol,Doxygen::mainPage->localToc());
     }
 
     ol.startTextBlock();