[soundconverter] Fix another last-used-folder "None" crash. (#836338)

[Michael Schwendt]

commit 31620f94e5f3bc57387a55fcbad8b2a65be42c87
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Jun 29 10:41:45 2012 +0200

    Fix another last-used-folder "None" crash. (#836338)

 soundconverter-2.0.3-last-used-folder-None.patch |   15 +++++++++++++++
 soundconverter.spec                              |    8 +++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-2.0.3-last-used-folder-None.patch b/soundconverter-2.0.3-last-used-folder-None.patch
new file mode 100644
index 0000000..bc1dbd6
--- /dev/null
+++ b/soundconverter-2.0.3-last-used-folder-None.patch
@@ -0,0 +1,15 @@
+diff -Nurb --strip-trailing-cr soundconverter-2.0.3-orig/soundconverter/ui.py soundconverter-2.0.3/soundconverter/ui.py
+--- soundconverter-2.0.3-orig/soundconverter/ui.py	2012-04-16 14:07:42.000000000 +0200
++++ soundconverter-2.0.3/soundconverter/ui.py	2012-06-29 10:37:39.539935110 +0200
+@@ -1250,8 +1250,9 @@
+                 extensions = [os.path.splitext(p)[1] for p in patterns]
+             self.filelist.add_uris(folders, extensions=extensions)
+ 
+-            self.prefs.set_string('last-used-folder',
+-                            self.addfolderchooser.get_current_folder_uri())
++            folder = self.addfolderchooser.get_current_folder_uri()
++            if folder:
++                self.prefs.set_string('last-used-folder',folder)
+ 
+         self.set_sensitive()
+ 
diff --git a/soundconverter.spec b/soundconverter.spec
index df1141a..9861225 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -12,6 +12,8 @@ Source0:        http://launchpad.net/soundconverter/trunk/%{tar_ver}/+download/s
 BuildArch:      noarch
 
 Patch0:         soundconverter-2.0.3-pre-2.0.4.patch
+# Fedora 836338
+Patch1:         soundconverter-2.0.3-last-used-folder-None.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool gettext
@@ -51,6 +53,7 @@ writes anything the GStreamer library can.
 %prep
 %setup -q -n %{name}-%{tar_ver}
 %patch0 -p1 -b .pre-2.0.4
+%patch1 -p1 -b .last-used-folder-None
 
 
 %build
@@ -101,6 +104,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Jun 29 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.3-5
+- Fix another last-used-folder "None" crash. (#836338)
+
 * Thu May 10 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.3-4
 - Apply newer post-2.0.3 batch mode fixes from upstream scm.
   This should also fix WAV batch encoding.