From a68a13f75ade1469be8cc6acd85f15aa0a2dc888 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 17 Apr 2011 13:41:17 -0600
Subject: [PATCH] ...

---
 src/calibre/gui2/layout.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 4a09c5b32e..c72b074463 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -317,9 +317,8 @@ class BaseToolBar(QToolBar): # {{{
         QToolBar.resizeEvent(self, ev)
         style = self.get_text_style()
         self.setToolButtonStyle(style)
-        if hasattr(self, 'd_widget'):
-            if hasattr(self.d_widget, 'filler'):
-                self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly)
+        if hasattr(self, 'd_widget') and hasattr(self.d_widget, 'filler'):
+            self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly)
 
     def get_text_style(self):
         style = Qt.ToolButtonTextUnderIcon