QML UI: Stop playback on episode delete

gpodder · Jan 12, 2012 · 17bd235 · 17bd235
1 parent 3c54436
commit 17bd235
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/data/ui/qml/Main.qml b/data/ui/qml/Main.qml
@@ -70,7 +70,7 @@ Image {
     state: 'podcasts'
 
     function togglePlayback(episode) {
-        if (episode.qfiletype == 'video') {
+        if (episode !== undefined && episode.qfiletype == 'video') {
             controller.playVideo(episode)
         } else {
             controller.currentEpisodeChanging()

diff --git a/data/ui/qml/MediaPlayer.qml b/data/ui/qml/MediaPlayer.qml
@@ -46,16 +46,22 @@ Item {
         property bool seekLater: false
 
         onPositionChanged: {
-            episode.qposition = position/1000
+            if (episode !== undefined) {
+                episode.qposition = position/1000
+            }
         }
 
         onDurationChanged: {
-            if (duration > 0) {
+            if (duration > 0 && episode !== undefined) {
                 episode.qduration = duration/1000
             }
         }
 
         onStatusChanged: {
+            if (episode === undefined) {
+                return;
+            }
+
             if (status == 6 && seekLater) {
                 position = episode.qposition*1000
                 seekLater = false
@@ -66,6 +72,10 @@ Item {
         }
 
         function setPosition(position) {
+            if (episode === undefined) {
+                return;
+            }
+
             if (!playing) {
                 playing = true
             } else {
@@ -94,12 +104,16 @@ Item {
             controller.releaseEpisode(mediaPlayer.episode)
         }
 
-        controller.acquireEpisode(episode)
-
         audioPlayer.paused = true
         mediaPlayer.episode = episode
-
         audioPlayer.stop()
+
+        if (episode === undefined) {
+            return;
+        }
+
+        controller.acquireEpisode(episode)
+
         audioPlayer.source = episode.qsourceurl
         audioPlayer.playing = true
         audioPlayer.paused = false

diff --git a/src/gpodder/qmlui/__init__.py b/src/gpodder/qmlui/__init__.py
@@ -413,6 +413,7 @@ def delete():
             self.update_subset_stats()
             self.root.mygpo_client.on_delete([episode])
             self.root.mygpo_client.flush()
+            self.root.on_episode_deleted(episode)
 
         self.confirm_action(_('Delete this episode?'), _('Delete'), delete)
 
@@ -684,6 +685,12 @@ def load_last_episode(self):
             # FIXME: Send last episode to player
             #self.select_episode(self.last_episode)
 
+    def on_episode_deleted(self, episode):
+        # If the episode that has been deleted is currently
+        # being played back (or paused), stop playback now.
+        if self.main.currentEpisode == episode:
+            self.main.togglePlayback(None)
+
     def run(self):
         return self.app.exec_()