X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=ff8e0a6d99a96b6294b9c0e8bfa6faf446f86473;hb=e050df33d29de6f7890b7111f6ea871aa5247743;hp=82aabab322edd9db41d9945a19c119e15537db13;hpb=f8bebb561d52fa25b320904bb0c6a08347d05611;p=chaz%2Ftint2

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 82aabab..ff8e0a6 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -94,6 +94,7 @@ void default_battery()
 
 void cleanup_battery()
 {
+	printf("*** cleanup_battery()\n");
 	if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
 	if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
 	if (path_energy_now) g_free(path_energy_now);
@@ -133,7 +134,6 @@ void init_battery()
 	if (directory)
 		g_dir_close(directory);
 	if (!battery_dir) {
-		cleanup_battery();
 		fprintf(stderr, "ERROR: battery applet can't found power_supply\n");
 		return;
 	}
@@ -166,6 +166,7 @@ void init_battery()
 		fp4 = fopen(path_status, "r");
 		if (fp1 == NULL || fp2 == NULL || fp3 == NULL || fp4 == NULL) {
 			cleanup_battery();
+			default_battery();
 			fprintf(stderr, "ERROR: battery applet can't open energy_now\n");
 		}
 		fclose(fp1);