X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclock%2Fclock.c;h=d020c5269fb33109494cd6a412d311d3fe238720;hb=0caca7524827e38c9d076f33dc66416d189184e8;hp=e29c138a687cf82825a38d24c2321ce669aebe83;hpb=43b8ed2d151faccd87735a6a6afb950584392937;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index e29c138..d020c52 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -163,22 +163,46 @@ void init_clock_panel(void *p)
 void cleanup_clock()
 {
 	clock_enabled = 0;
-	if (time1_font_desc)
+	if (time1_font_desc) {
 		pango_font_description_free(time1_font_desc);
-	if (time2_font_desc)
+		time1_font_desc = 0;
+	}
+	if (time2_font_desc) {
 		pango_font_description_free(time2_font_desc);
-	g_free(time1_format);
-	g_free(time2_format);
-	g_free(time_tooltip_format);
-	g_free(time1_timezone);
-	g_free(time2_timezone);
-	g_free(time_tooltip_timezone);
-	g_free(clock_lclick_command);
-	g_free(clock_rclick_command);
-	time1_font_desc = time2_font_desc = 0;
-	time1_format = time2_format = time_tooltip_format = 0;
-	time1_timezone = time2_timezone = time_tooltip_timezone = 0;
-	clock_lclick_command = clock_rclick_command = 0;
+		time2_font_desc = 0;
+	}
+	if (time1_format) {
+		g_free(time1_format);
+		time1_format = 0;
+	}
+	if (time2_format) {
+		g_free(time2_format);
+		time2_format = 0;
+	}
+	if (time_tooltip_format) {
+		g_free(time_tooltip_format);
+		time_tooltip_format = 0;
+	}
+	if (time1_timezone) {
+		g_free(time1_timezone);
+		time1_timezone = 0;
+	}
+	if (time2_timezone) {
+		g_free(time2_timezone);
+		time2_timezone = 0;
+	}
+	if (time_tooltip_timezone) {
+		g_free(time_tooltip_timezone);
+		time_tooltip_timezone = 0;
+	}
+	if (clock_lclick_command) {
+		g_free(clock_lclick_command);
+		clock_lclick_command = 0;
+	}
+	if (clock_rclick_command) {
+		g_free(clock_rclick_command);
+		clock_rclick_command = 0;
+	}
 }