From adca760c3795fef8e5fab61cbc5e6be9bde9f7dd Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Nov 21 2009 21:13:08 +0000
Subject: - Avoid crash in unconfigured icecast effects plugin.

- Fix non-top-level icecast plugin dialog.
- Fix non-top-level sndstretch plugin dialog.

---

diff --git a/audacious-plugins-2.1-icecast.patch b/audacious-plugins-2.1-icecast.patch
index 0a65a19..66babc4 100644
--- a/audacious-plugins-2.1-icecast.patch
+++ b/audacious-plugins-2.1-icecast.patch
@@ -1,7 +1,41 @@
 diff -Nur audacious-plugins-fedora-2.1-orig/src/icecast/icecast.c audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c
 --- audacious-plugins-fedora-2.1-orig/src/icecast/icecast.c	2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c	2009-11-21 21:10:32.267815839 +0100
-@@ -609,6 +609,7 @@
++++ audacious-plugins-fedora-2.1-icecast/src/icecast/icecast.c	2009-11-21 22:10:03.314818476 +0100
+@@ -87,6 +87,7 @@
+ static gchar *stream_description = NULL;
+ 
+ static gboolean ep_playing = FALSE;
++static gboolean init_end = FALSE;
+ 
+ VFSFile *output_file = NULL;
+ guint64 written = 0;
+@@ -251,6 +252,7 @@
+ 
+     if (ep_playing == TRUE)
+         return 0;
++    init_end = FALSE;
+ 
+     if (buffersize != buffersize_new)
+     {
+@@ -379,6 +381,7 @@
+         }
+     }
+ 
++    init_end = TRUE;
+     convert_init(fmt, plugin->format_required, nch);
+ 
+     rv = (plugin->open)();
+@@ -399,6 +402,9 @@
+ {
+     if (ice_tid)
+         g_source_remove(ice_tid);
++    if (!init_end) {
++        return length;
++    }
+ 
+     if (!shout)
+     {
+@@ -609,6 +615,7 @@
          plugin_new = plugin;
  
          configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 734123b..f6ebea8 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -257,7 +257,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Nov 21 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-20
+* Sat Nov 21 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-21
+- Avoid crash in unconfigured icecast effects plugin.
 - Fix non-top-level icecast plugin dialog.
 - Fix non-top-level sndstretch plugin dialog.