From 9188e569d4ba5db239776e08eacb95849892a282 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Tue, 14 Jun 2011 21:07:42 +0000 Subject: [PATCH] destroy main window before breaking gtk main loop --- src/ui.c | 5 +++-- src/ui.h | 2 +- src/ui_graph.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ui.c b/src/ui.c index 1590cea..d795d15 100644 --- a/src/ui.c +++ b/src/ui.c @@ -61,7 +61,7 @@ static void cb_about(GtkMenuItem *mi, gpointer data) static void cb_menu_quit(GtkMenuItem *mi, gpointer data) { - ui_psensor_quit(); + ui_psensor_quit((struct ui_psensor *)data); } static void cb_preferences(GtkMenuItem *mi, gpointer data) @@ -77,8 +77,9 @@ static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data) ui_sensorpref_dialog_run(*ui->sensors, ui); } -void ui_psensor_quit() +void ui_psensor_quit(struct ui_psensor *ui) { + gtk_widget_destroy(ui->main_window); gtk_main_quit(); } diff --git a/src/ui.h b/src/ui.h index 4824bce..9410274 100644 --- a/src/ui.h +++ b/src/ui.h @@ -85,7 +85,7 @@ void ui_window_update(struct ui_psensor *); /* Must be called to terminate Psensor UI. */ -void ui_psensor_quit(); +void ui_psensor_quit(struct ui_psensor *ui); /* Creates the main GTK window diff --git a/src/ui_graph.c b/src/ui_graph.c index 14fb6ef..2edd8c7 100644 --- a/src/ui_graph.c +++ b/src/ui_graph.c @@ -24,7 +24,7 @@ static void cb_menu_quit(GtkMenuItem *mi, gpointer data) { - ui_psensor_quit(); + ui_psensor_quit((struct ui_psensor *)data); } static void cb_preferences(GtkMenuItem *mi, gpointer data) -- 2.7.4