[soundconverter] Fix a corner-case traceback upon cancelling tag reading.

[Michael Schwendt]

commit d9d802d11514f50cc1a23999230de16b4a2f2236
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Mar 5 00:47:34 2013 +0100

    Fix a corner-case traceback upon cancelling tag reading.

 soundconverter-2.0.4-fedora.patch |   19 ++++++++++---------
 soundconverter.spec               |    7 +++++--
 2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/soundconverter-2.0.4-fedora.patch b/soundconverter-2.0.4-fedora.patch
index fc0fea9..f1260f1 100644
--- a/soundconverter-2.0.4-fedora.patch
+++ b/soundconverter-2.0.4-fedora.patch
@@ -235,7 +235,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/queue.py soundconverter-2.0.4
          for task in self.running_tasks:
 diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fedora/soundconverter/ui.py
 --- soundconverter-2.0.4-orig/soundconverter/ui.py	2012-10-06 12:43:23.000000000 +0200
-+++ soundconverter-2.0.4-fedora/soundconverter/ui.py	2013-03-02 10:38:59.782652397 +0100
++++ soundconverter-2.0.4-fedora/soundconverter/ui.py	2013-03-05 00:44:29.572154045 +0100
 @@ -93,7 +93,10 @@
      def show_error(self, primary, secondary):
          self.primary.set_markup(primary)
@@ -351,7 +351,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
          self.set_sensitive()
  
      def on_clearlist_activate(self, *args):
-@@ -1305,11 +1321,22 @@
+@@ -1305,11 +1321,23 @@
  
          tagreader = TagReader(sound_file)
          tagreader.set_found_tag_hook(self.tags_read)
@@ -359,7 +359,8 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
          tagreader.start()
  
      def tags_read(self, tagreader):
-+        self.tag_reader_tasks.remove(tagreader)
++        if tagreader in self.tag_reader_tasks:
++            self.tag_reader_tasks.remove(tagreader)
 +        if tagreader.plugin_added:
 +            self.plugin_added = True
          sound_file = tagreader.get_sound_file()
@@ -375,7 +376,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
  
      def on_progress(self):
          if self.pulse_progress >= 0: # still waiting for tags
-@@ -1335,7 +1362,11 @@
+@@ -1335,7 +1363,11 @@
                      sound_file.progress = None
          return running
  
@@ -388,7 +389,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
          try:
              self.pulse_progress = -1
              gobject.timeout_add(100, self.on_progress)
-@@ -1347,6 +1378,10 @@
+@@ -1347,6 +1379,10 @@
              total = len(files)
              for i, sound_file in enumerate(files):
                  gtk_iteration()
@@ -399,7 +400,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
                  self.pulse_progress = float(i)/total
                  sound_file.progress = None
                  if self.prefs.require_tags:
-@@ -1354,6 +1389,15 @@
+@@ -1354,6 +1390,15 @@
                  else:
                      self.converter.add(sound_file)
  
@@ -415,7 +416,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
          except ConverterQueueCanceled:
              log('cancelling conversion.')
              self.conversion_ended()
-@@ -1362,12 +1406,24 @@
+@@ -1362,12 +1407,24 @@
              self.conversion_ended()
              self.set_status(_('Error when converting'))
          else:
@@ -440,7 +441,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
      def on_convert_button_clicked(self, *args):
          # reset and show progress bar
          self.set_progress(0)
-@@ -1395,6 +1451,8 @@
+@@ -1395,6 +1452,8 @@
  
      def on_button_cancel_clicked(self, *args):
          self.converter.abort()
@@ -449,7 +450,7 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fe
          self.set_status(_('Canceled'))
          self.set_sensitive()
          self.conversion_ended()
-@@ -1430,6 +1488,7 @@
+@@ -1430,6 +1489,7 @@
          self.filelist.hide_row_progress()
          self.status_frame.show()
          self.widget.set_sensitive(True)
diff --git a/soundconverter.spec b/soundconverter.spec
index 396c8b8..336e607 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.4
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -48,7 +48,7 @@ BuildArch:      noarch
 #     soundconverter-2.0.4-cancel-per-file-progress.patch
 # applied, lp 1139620
 #     soundconverter-2.0.4-remove-fix-sf-filelist_row.patch
-# not yet reported: incorrect task queue size
+# reported, lp 1145088: incorrect task queue size
 # not yet reported: rare case of aborted task reaching task_finished()
 Patch0: soundconverter-2.0.4-fedora.patch
 
@@ -143,6 +143,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Mar  4 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-24
+- Fix a corner-case traceback upon cancelling tag reading.
+
 * Sat Mar  2 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-23
 - Fix set_row_progress "could not find tree path" (#915419).