=== modified file 'data/ui/cover_prefs_pane.ui'
--- data/ui/cover_prefs_pane.ui	2009-11-14 22:05:25 +0000
+++ data/ui/cover_prefs_pane.ui	2009-12-13 11:38:10 +0000
@@ -95,7 +95,17 @@
               <placeholder/>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkCheckButton" id="covers/automatic_fetching">
+                <property name="label" translatable="yes">Automatically fetch album cover on playback start</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
             </child>
           </object>
           <packing>

=== modified file 'xlgui/cover.py'
--- xlgui/cover.py	2009-12-10 15:03:48 +0000
+++ xlgui/cover.py	2009-12-13 17:34:09 +0000
@@ -461,20 +461,14 @@
                     update_track=True)
             except cover.NoCoverFoundException:
                 logger.warning("No covers found")
-                gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
                 return
         else:
             try:
                 item = cover.get_album_tuple(track)
-                if item[0] and item[1]:
-                    cov = self.coverdb.get_cover(item[0], item[1])
-            except TypeError: # one of the fields is missing
-                pass
-            except AttributeError:
-                pass
-
+                cov = self.covers.coverdb.get_cover(item[0], item[1])
+            except (TypeError,AttributeError):
+                return
             if not cov:
-                gobject.idle_add(self.image.set_image, xdg.get_data_path('images/nocover.png'))
                 return
 
         if self.player.current == self.current_track:

=== modified file 'xlgui/prefs/cover_prefs.py'
--- xlgui/prefs/cover_prefs.py	2009-11-14 22:05:25 +0000
+++ xlgui/prefs/cover_prefs.py	2009-12-13 11:31:13 +0000
@@ -52,3 +52,7 @@
             self.prefs.main.exaile.covers.set_preferred_order(
                 self.items)
         return True
+        
+class AutomaticCoverFetching(widgets.CheckPrefsItem):
+    default = True
+    name = 'covers/automatic_fetching'