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/notify.c
+++ b/src/notify.c
@@ -190,7 +190,10 @@ void
 notify_stop_main_thread (void)
 {
  if (notify_t_main)
-    pthread_cancel (notify_t_main);
+    {
+      pthread_cancel (notify_t_main);
+      pthread_join (notify_t_main, NULL);
+    }
 }

 /*