Updating branch refs/heads/master
to f9ca75a7dedad8eaef97c0a1a11d397664bae78a (commit)
from b15809e07aeec55cce1d8184f4ec4905ceb97130 (commit)
commit f9ca75a7dedad8eaef97c0a1a11d397664bae78a
Author: Guido Berhoerster <[email protected]>
Date: Sat Sep 22 09:15:33 2012 +0200
Do not try to destroy the mixer window twice after a delete-event (bug
#8288)
NEWS | 2 ++
xfce4-mixer/xfce-mixer-window.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 50eff9e..7bdbf49 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
=====
- Handle a negative minimal volume correctly.
- Fix a potential NULL pointer dereference.
+- Do not try to destroy the mixer window twice after a delete-event
+ (bug #8288).
4.8.0
diff --git a/xfce4-mixer/xfce-mixer-window.c b/xfce4-mixer/xfce-mixer-window.c
index acbc67f..0c6a1e9 100644
--- a/xfce4-mixer/xfce-mixer-window.c
+++ b/xfce4-mixer/xfce-mixer-window.c
@@ -333,8 +333,6 @@ xfce_mixer_window_close (GtkAction *action,
{
/* This is a nasty hack to save the settings before the application quits */
xfce_mixer_window_closed (GTK_WIDGET (window), NULL, window);
-
- gtk_main_quit ();
}
@@ -350,7 +348,9 @@ xfce_mixer_window_closed (GtkWidget *window,
gtk_window_get_size (GTK_WINDOW (mixer_window), &width, &height);
g_object_set (G_OBJECT (mixer_window->preferences), "window-width", width,
"window-height", height, NULL);
- return FALSE;
+ gtk_main_quit ();
+
+ return TRUE;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
