Someone

Index: elisa/core/plugins/music.py
===================================================================
--- elisa/core/plugins/music.py (révision 1544)
+++ elisa/core/plugins/music.py (copie de travail)
@@ -9,6 +9,7 @@
 from elisa.core.menu import MenuItem
 from elisa.core import common, media_uri
 from elisa.core.utils import image
+from elisa.core.plugins import pictures
 
 import elisa.core.utils.misc
 import sys
@@ -98,6 +99,7 @@
         dfr = None
 
         def launch(r):
+            self._check_slideshow()
             self.logger.info('Playing music %s' % music_file)
             player.play(start=True)
             player.un_mute()
@@ -118,6 +120,13 @@
             self.unlock()
             
     item_action = play_item
+
+    def _check_slideshow(self):
+        task_manager = common.get_application().get_task_manager()
+        slideshows = task_manager.get_tasks_with_type(pictures.Slideshow)
+        if slideshows:
+            slideshow[0].abort_slideshow()
+        
  
     def get_folder_thumbnail(self, uri, widget_item, size, thumbnail):
         if not thumbnail: