From ce80ffdea7afc1d3bd6db1b7b12361cb2bb8a33f Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Thu, 6 Feb 2020 16:25:07 +0900 Subject: [PATCH] Make sure to destroy context after thread gets joined Change-Id: I44468b6fca2f456cdc136ffd071eadc8cd82472e --- src/legacy_support/websocket.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp index 3e218d7..50e24e1 100644 --- a/src/legacy_support/websocket.cpp +++ b/src/legacy_support/websocket.cpp @@ -502,8 +502,6 @@ bool CWebHelperAgentWebSocket::exit() g_ws_server_exit = true; if (g_ws_server_context) { lws_cancel_service(g_ws_server_context); - lws_context_destroy(g_ws_server_context); - g_ws_server_context = NULL; } if (m_message_pipe) { @@ -520,6 +518,11 @@ bool CWebHelperAgentWebSocket::exit() pthread_mutex_destroy(&g_ws_server_mutex); + if (g_ws_server_context) { + lws_context_destroy(g_ws_server_context); + g_ws_server_context = NULL; + } + ecore_shutdown(); return true; -- 2.34.1