From c3811309b0e2449e01562e2cd458e5b66907f823 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 17 Apr 2011 15:34:11 -0600
Subject: [PATCH] ...

---
 src/calibre/gui2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 2bbf4243eb..773aea3002 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -656,7 +656,7 @@ def get_current_db():
     '''
     from calibre.gui2.ui import get_gui
     gui = get_gui()
-    if gui is not None:
+    if gui is not None and gui.current_db is not None:
         return gui.current_db
     from calibre.library import db
     return db()