fix clock to update even if it is on line two

[chaz/tint2] / src / clock / clock.c

diff --git a/src/clock/clock.c b/src/clock/clock.c
index ec17a9fad6659477022a0ca76412cad02b9af8e0..6212dc12dde23407ed8ddc8035c960000adf5684 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -130,8 +130,9 @@ const char* clock_get_tooltip(void* obj)
 
 void init_clock()
 {
-       if(time1_format && clock_timeout==0) {
-               if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
+       if((time1_format || time2_format) && clock_timeout==0) {
+               if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r') ||
+                   strchr(time2_format, 'S') || strchr(time2_format, 'T') || strchr(time2_format, 'r'))
                        clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0);
                else
                        clock_timeout = add_timeout(10, 1000, update_clocks_min, 0);
@@ -143,7 +144,9 @@ void init_clock_panel(void *p)
 {
        Panel *panel =(Panel*)p;
        Clock *clock = &panel->clock;
-
+       
+       if (clock->area.bg == 0)
+               clock->area.bg = &g_array_index(backgrounds, Background, 0);
        clock->area.parent = p;
        clock->area.panel = p;
        clock->area._draw_foreground = draw_clock;