summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2010-07-29 14:17:45 +0000
committerJim Ramsay <lack@gentoo.org>2010-07-29 14:17:45 +0000
commit4adb2faf728c1e440e303eff7e4a88a289ae95fa (patch)
tree29f9ee1b6997afadc13c9df75780d1e27cc6f413 /x11-plugins/gkrellm-volume/files
parentStable on amd64 wrt bug #330111 (diff)
downloadgentoo-2-4adb2faf728c1e440e303eff7e4a88a289ae95fa.tar.gz
gentoo-2-4adb2faf728c1e440e303eff7e4a88a289ae95fa.tar.bz2
gentoo-2-4adb2faf728c1e440e303eff7e4a88a289ae95fa.zip
Patch to not crash gkrellm when disabling/reenabling this plugin (Bug #284504)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/gkrellm-volume/files')
-rw-r--r--x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
new file mode 100644
index 000000000000..a3e3218dc02f
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-reenable.patch
@@ -0,0 +1,14 @@
+diff --git a/volume.c b/volume.c
+index 18418d1..58708d4 100644
+--- a/volume.c
++++ b/volume.c
+@@ -74,6 +74,9 @@ static void remove_all_mixers() {
+ static Slider *add_slider(Mixer *m, int dev) {
+ Slider *result,*s;
+ if (dev < 0 || dev >= mixer_get_nr_devices(m->mixer)) return NULL;
++ for (s = m->Sliderz ; s != NULL; s = s->next)
++ if (s->dev == dev)
++ return s;
+ result = malloc(sizeof(Slider));
+ result->mixer = m->mixer;
+ result->parent = m;