From 39b153fdd100088b567130a354824ef49b190009 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 18 Aug 2009 22:09:07 +0200 Subject: Bugfix: Correctly terminate output if time is specified in order but no time_format given (Thanks XTaran) --- i3status.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'i3status.c') diff --git a/i3status.c b/i3status.c index 04fa57f..37e6639 100644 --- a/i3status.c +++ b/i3status.c @@ -152,12 +152,16 @@ int main(int argc, char *argv[]) { generate(ORDER_BATTERY, "battery", get_battery_info(current)); } - if (j == order[ORDER_TIME] && time_format != NULL) { - /* Get date & time */ - time_t current_time = time(NULL); - struct tm *current_tm = localtime(¤t_time); - (void)strftime(part, sizeof(part), time_format, current_tm); - generate(ORDER_TIME, "time", part); + if (j == order[ORDER_TIME]) { + if (time_format != NULL) { + /* Get date & time */ + time_t current_time = time(NULL); + struct tm *current_tm = localtime(¤t_time); + (void)strftime(part, sizeof(part), time_format, current_tm); + generate(ORDER_TIME, "time", part); + } else { + generate(ORDER_TIME, "time", ""); + } } } -- cgit v1.2.3