#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
irungentoo_trip 2014-10-25 08:55:42 -07:00
commit 9b5aa3ff27

View File

@ -631,6 +631,7 @@ static void *timer_poll( void *arg )
usleep(handler->resolution);
}
free(handler);
pthread_exit(NULL);
}
@ -699,8 +700,6 @@ static void timer_terminate_session(TimerHandler *handler)
free(handler->timers);
pthread_mutex_destroy( &handler->mutex );
free(handler);
}
/**