diff options
| -rwxr-xr-x | src/mtp_event_handler.c | 3 | ||||
| -rwxr-xr-x | src/mtp_init.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mtp_event_handler.c b/src/mtp_event_handler.c index 0dbf921..417c748 100755 --- a/src/mtp_event_handler.c +++ b/src/mtp_event_handler.c @@ -274,9 +274,10 @@ static void *__thread_event_handler(void *arg) } } - DBG("######### MTP TERMINATED #########"); + DBG("Event handler terminated"); close(g_pipefd[0]); close(g_pipefd[1]); + mtp_end_event(); _util_thread_exit("__thread_event_handler thread is over."); return NULL; diff --git a/src/mtp_init.c b/src/mtp_init.c index 2f749a1..02a7b1b 100755 --- a/src/mtp_init.c +++ b/src/mtp_init.c @@ -67,7 +67,7 @@ static void __mtp_exit(void) long cur_time; DBG("## Terminate all threads"); - if (g_eh_thrd) { + if (g_eh_thrd && g_eh_thrd != pthread_self()) { _eh_send_event_req_to_eh_thread(EVENT_USB_REMOVED, 0, 0, NULL); if (_util_thread_join(g_eh_thrd, NULL) == FALSE) ERR("_util_thread_join() Fail"); @@ -84,6 +84,9 @@ static void __mtp_exit(void) g_main_loop_quit(g_mainloop); + if (g_eh_thrd == pthread_self()) + _util_thread_exit("Event handler stopped itself"); + return; } @@ -505,5 +508,7 @@ int main(int argc, char *argv[]) _eh_deregister_notification_callbacks(); media_content_disconnect(); + DBG("######### MTP TERMINATED #########"); + return MTP_ERROR_NONE; } |