From d7c94246d74f1797e70918b14493788aa8e10f42 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 15 Jul 2009 13:03:39 -0600
Subject: [PATCH] Fix #2842 (Collections out of order on PRS-505 when batch
 uploading)

---
 src/calibre/gui2/device.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 3bde907f95..19228afa92 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -728,7 +728,8 @@ class DeviceGUI(object):
                                     specific_format=specific_format,
                                     exclude_auto=do_auto_convert)
         if do_auto_convert:
-            ids = list(set(ids).difference(_auto_ids))
+            ok_ids = list(set(ids).difference(_auto_ids))
+            ids = [i for i in ids if i in ok_ids]
         else:
             _auto_ids = []