Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #1171: Order of object destruction #1175

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Fix issue #1171: Order of object destruction #1175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Release/src/websockets/client/ws_client_wspp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,6 @@ class wspp_callback_client : public websocket_client_callback_impl,
}
} // unlock

// Delete client to make sure Websocketpp cleans up all Boost.Asio portions.
m_client.reset();

if (connecting)
{
websocket_exception exc(ec, build_error_msg(ec, "set_fail_handler"));
Expand Down Expand Up @@ -801,15 +798,14 @@ class wspp_callback_client : public websocket_client_callback_impl,
websocketpp::client<websocketpp::config::asio_tls_client> m_client;
};

websocketpp::connection_hdl m_con;

pplx::task_completion_event<void> m_connect_tce;
pplx::task_completion_event<void> m_close_tce;

// Used to safe guard the wspp client.
std::mutex m_wspp_client_lock;
State m_state;
std::unique_ptr<websocketpp_client_base> m_client;
websocketpp::connection_hdl m_con;

// Queue to track pending sends
outgoing_msg_queue m_out_queue;
Expand Down