mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4669 from wwylele/rpc-server-freeze

Browse source 
rpc: send ending packet in Server instead of UDPServer
This commit is contained in:
James Rowe 2019-03-06 09:11:04 -07:00 committed by GitHub
commit 5954dc11ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/rpc/server.cpp
View file

@ -25,6 +25,7 @@ void Server::Start() {
void Server::Stop() { void Server::Stop() {
udp_server.reset(); udp_server.reset();
NewRequestCallback(nullptr); // Notify the RPC server to end
} }
void Server::NewRequestCallback(std::unique_ptr<RPC::Packet> new_request) { void Server::NewRequestCallback(std::unique_ptr<RPC::Packet> new_request) {

5
src/core/rpc/udp_server.cpp
View file

@ -20,10 +20,7 @@ public:
new_request_callback(std::move(new_request_callback)) { new_request_callback(std::move(new_request_callback)) {
StartReceive(); StartReceive();
worker_thread = std::thread([this] { worker_thread = std::thread([this] { io_context.run(); });
io_context.run();
this->new_request_callback(nullptr);
});
} }
~Impl() { ~Impl() {