Merge branch 'maint'

Conflicts: src/calcurse.h src/io.c
2011-11-11 12:29:48 +01:00
parent 6f01c7af97 3aefd00f6a
commit 14b6ae79a2
5 changed files with 20 additions and 7 deletions
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -145,7 +145,10 @@ void
 calendar_stop_date_thread (void)
 {
  if (calendar_t_date)
-    pthread_cancel (calendar_t_date);
+    {
+      pthread_cancel (calendar_t_date);
+      pthread_join (calendar_t_date, NULL);
+    }
 }

 /* Set static variable today to current date */