Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 02:25:09 +00:00
Code Issues Releases Activity

Gracefully exit from main_loop()

Browse Source 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
This commit is contained in:
Nikos Ntarmos 2009-05-28 16:50:19 +03:00 committed by Brenden Matthews
parent c03655bdfa
commit b51d06d178
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conky.c
View File

@ -6479,6 +6479,7 @@ int inotify_fd;
static void main_loop(void)
{
int terminate = 0;
#ifdef SIGNAL_BLOCKING
sigset_t newmask, oldmask;
#endif
@ -6500,7 +6501,7 @@ static void main_loop(void)
next_update_time = last_update_time = get_time();
info.looped = 0;
while (total_run_times == 0 || info.looped < total_run_times) {
while (terminate == 0 && (total_run_times == 0 || info.looped < total_run_times)) {
info.looped++;
#ifdef SIGNAL_BLOCKING
@ -6776,6 +6777,7 @@ static void main_loop(void)
case SIGINT:
case SIGTERM:
ERR("received SIGINT or SIGTERM to terminate. bye!");
terminate = 1;
clean_up();
#ifdef X11
if (output_methods & TO_X) {
@ -6798,8 +6800,7 @@ static void main_loop(void)
free(append_file);
append_file = 0;
}
return; /* return from main_loop */
/* break; */
break;
default:
/* Reaching here means someone set a signal
* (SIGXXXX, signal_handler), but didn't write any code