From 0d57a3fb18f03574a242789cce9189e33aa2e54e Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 29 May 2011 14:09:01 +0100
Subject: [PATCH] Correct some problems with setting the ondevice column values
 when the device is disconnected.

---
 src/calibre/gui2/device.py               | 3 ++-
 src/calibre/gui2/library/models.py       | 2 +-
 src/calibre/utils/formatter_functions.py | 5 +----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 3977a6bca1..dd9d7aaa50 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -1294,7 +1294,8 @@ class DeviceMixin(object): # {{{
             self.book_db_uuid_path_map = None
             return
 
-        if not hasattr(self, 'db_book_uuid_cache'):
+        if not self.device_manager.is_device_connected or \
+                        not hasattr(self, 'db_book_uuid_cache'):
             return loc
 
         if self.book_db_id_cache is None:
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 554b104c34..793f2d353b 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -125,7 +125,7 @@ class BooksModel(QAbstractTableModel): # {{{
 
     def refresh_ondevice(self):
         self.db.refresh_ondevice()
-        self.resort()
+        self.refresh(reset=False)
         self.research()
 
     def set_book_on_device_func(self, func):
diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py
index d7b6e63f5e..76faf04941 100644
--- a/src/calibre/utils/formatter_functions.py
+++ b/src/calibre/utils/formatter_functions.py
@@ -579,10 +579,7 @@ class BuiltinOndevice(BuiltinFormatterFunction):
 
     def evaluate(self, formatter, kwargs, mi, locals):
         if mi.ondevice_col:
-            try:
-                return _('Yes')
-            except:
-                pass
+            return _('Yes')
         return ''
 
 class BuiltinFirstNonEmpty(BuiltinFormatterFunction):