From d05b92a92b5ae8f826d1228f0334ff63008ee454 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Thu, 13 Jan 2011 17:32:08 +0000
Subject: [PATCH] Get current source -- some strange merge artefacts.

---
 src/calibre/gui2/ui.py         | 8 +++++++-
 src/calibre/library/catalog.py | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py
index 8c92fec0d7..9eb202d761 100644
--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@@ -279,7 +279,13 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
         self.set_window_title()
 
         for ac in self.iactions.values():
-            ac.initialization_complete()
+            try:
+                ac.initialization_complete()
+            except:
+                import traceback
+                traceback.print_exc()
+                if ac.plugin_path is None:
+                    raise
 
         if show_gui and self.gui_debug is not None:
             info_dialog(self, _('Debug mode'), '<p>' +
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 5cda9baa8c..0be2d7fc05 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -3250,7 +3250,7 @@ class EPUB_MOBI(CatalogPlugin):
             # Loop over the series titles, find start of each letter, add description_preview_count books
             # Special switch for using different title list
             title_list = self.booksBySeries
-            current_letter = self.letter_or_symbol(title_list[0]['series'][0])
+            current_letter = self.letter_or_symbol(self.generateSortTitle(title_list[0]['series'])[0])
             title_letters = [current_letter]
             current_series_list = []
             current_series = ""