rpms/rhythmbox/devel rhythmbox-0.9.5-missing-radio-crash.patch, NONE, 1.1 rhythmbox.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18910

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.5-missing-radio-crash.patch 
Log Message:
fix a crash


rhythmbox-0.9.5-missing-radio-crash.patch:
 rb-shell-player.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE rhythmbox-0.9.5-missing-radio-crash.patch ---
--- rhythmbox-0.9.5/shell/rb-shell-player.c.missing-radio-crash.patch	2006-09-13 01:34:31.000000000 -0400
+++ rhythmbox-0.9.5/shell/rb-shell-player.c	2006-09-13 01:34:36.000000000 -0400
@@ -2473,7 +2473,8 @@
 	if (err->code == RB_PLAYER_ERROR_NO_AUDIO) {
 		/* stream has completely ended */
 		rb_shell_player_set_playing_source (player, NULL);
-	} else if (rb_source_handle_eos (player->priv->current_playing_source) == RB_SOURCE_EOF_RETRY) {
+	} else if (player->priv->current_playing_source == NULL || 
+                   rb_source_handle_eos (player->priv->current_playing_source) == RB_SOURCE_EOF_RETRY) {
 		/* receiving an error means a broken stream or non-audio stream, so abort */
 		rb_error_dialog (NULL, 
 				 _("Couldn't start playback"), 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- rhythmbox.spec	8 Sep 2006 02:28:48 -0000	1.77
+++ rhythmbox.spec	13 Sep 2006 05:35:06 -0000	1.78
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.5
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -42,6 +42,7 @@
 Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 Patch3: rhythmbox-0.9.5-dbus-deprecated.patch
 Patch4: rhythmbox-0.9.5-transparent.patch
+Patch5: rhythmbox-0.9.5-missing-radio-crash.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -54,6 +55,7 @@
 %patch2 -p1 -b .use-icon-name
 %patch3 -p1 -b .dbus-deprecated
 %patch4 -p1 -b .transparent
+%patch5 -p1 -b .missing-radio-crash
 
 %build
 
@@ -133,6 +135,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Sep 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.5-4
+- Fix a crash when a radio station is missing  (#206170)
+
 * Thu Sep  7 2006 Matthias Clasen <mclasen at redhat.com> - 0.9.5-3
 - Support transparent panels (#205584)