From e2b093f6ab039027515ce1bfbb2180c58818394c Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 18 Aug 2010 11:23:19 +0100
Subject: [PATCH] Improve the fix for #6537 - series order on sony being lost

---
 src/calibre/devices/usbms/books.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/usbms/books.py b/src/calibre/devices/usbms/books.py
index 2b304da27f..959f26199c 100644
--- a/src/calibre/devices/usbms/books.py
+++ b/src/calibre/devices/usbms/books.py
@@ -181,7 +181,9 @@ class CollectionsBookList(BookList):
                     if lpath not in collections_lpaths[category]:
                         collections_lpaths[category].add(lpath)
                         collections[category].append(book)
-                    if attr == 'series' or getattr(book, 'series', None) == category:
+                    if attr == 'series' or \
+                            ('series' in collection_attributes and
+                             getattr(book, 'series', None) == category):
                         series_categories.add(category)
         # Sort collections
         for category, books in collections.items():