diff options
| author | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-11-11 12:29:48 +0100 |
|---|---|---|
| committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2011-11-11 12:29:48 +0100 |
| commit | 14b6ae79a25106501a30693889b1c03abd56c8c1 (patch) | |
| tree | f33f550d29c781ab523c895df6338c420253964c /src/notify.c | |
| parent | 6f01c7af972dbf4698c63b707b225469b9405e47 (diff) | |
| parent | 3aefd00f6aebad7c50210e68650cb8c42e0835cd (diff) | |
| download | calcurse-14b6ae79a25106501a30693889b1c03abd56c8c1.zip | |
Merge branch 'maint'
Conflicts:
src/calcurse.h
src/io.c
Diffstat (limited to 'src/notify.c')
| -rw-r--r-- | src/notify.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/notify.c b/src/notify.c index ae9bcbe..6529087 100644 --- 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); + } } /* |