From: Max Kellermann <max@duempel.org>
Date: Fri, 14 Aug 2009 21:50:17 +0000 (+0200)
Subject: main: free timers on exit
X-Git-Tag: release-0.15~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ded81efbbb699e9d93dabbda731cacf34c8845f3;p=ncmpc.git

main: free timers on exit

Make valgrind happier.
---

diff --git a/src/main.c b/src/main.c
index fc73366..ed75977 100644
--- a/src/main.c
+++ b/src/main.c
@@ -62,6 +62,10 @@ static gboolean connected = FALSE;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, idle_source_id, update_source_id;
 
+#ifndef NCMPC_MINI
+static guint check_key_bindings_source_id;
+#endif
+
 static const gchar *
 error_msg(const gchar *msg)
 {
@@ -344,10 +348,12 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 	gboolean key_error;
 
 	key_error = check_key_bindings(NULL, buf, sizeof(buf));
-	if (!key_error)
+	if (!key_error) {
 		/* no error: disable this timer for the rest of this
 		   process */
+		check_key_bindings_source_id = 0;
 		return FALSE;
+	}
 
 #ifdef ENABLE_KEYDEF_SCREEN
 	g_strchomp(buf);
@@ -506,7 +512,7 @@ main(int argc, const char *argv[])
 					 timer_mpd_update,
 					 GINT_TO_POINTER(TRUE));
 #ifndef NCMPC_MINI
-	g_timeout_add(10000, timer_check_key_bindings, NULL);
+	check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
 #endif
 	idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
 
@@ -516,6 +522,14 @@ main(int argc, const char *argv[])
 
 	/* cleanup */
 
+	g_source_remove(update_source_id);
+	g_source_remove(idle_source_id);
+
+#ifndef NCMPC_MINI
+	if (check_key_bindings_source_id != 0)
+		g_source_remove(check_key_bindings_source_id);
+#endif
+
 	g_main_loop_unref(main_loop);
 	g_io_channel_unref(keyboard_channel);