[Xfce4-commits] <xfce4-mixer:gber/improvements> Do not try to destroy the mixer window twice after a delete-event (bug #8288)

[Guido Berhoerster]

Updating branch refs/heads/gber/improvements
         to 2df866c1df3f06834884533dac33f6eb2d966d3d (commit)
       from cec93be0c61ece5e0e83cec2d29d9c4d5a8267f7 (commit)

commit 2df866c1df3f06834884533dac33f6eb2d966d3d
Author: Guido Berhoerster <guido+xfce at berhoerster.name>
Date:   Fri Sep 21 12:00:36 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;
 }