diff --git a/Core/HLE/AdhocTransportRelay.cpp b/Core/HLE/AdhocTransportRelay.cpp index c2d6eab722..90ebab64a7 100644 --- a/Core/HLE/AdhocTransportRelay.cpp +++ b/Core/HLE/AdhocTransportRelay.cpp @@ -759,13 +759,16 @@ static bool postoffice_can_recv_or_listen_has_request(int idx) { if (pdp_handle == NULL) { return false; } - int peek_len = pdp_buffered_data_size(pdp_handle); + int peek_len = pdp_peek_next_size(pdp_handle); if (peek_len == AEMU_POSTOFFICE_CLIENT_SESSION_DEAD) { internal->postofficeHandle = NULL; pdp_delete(pdp_handle); return false; } - if (peek_len > 0) { + if (peek_len == AEMU_POSTOFFICE_CLIENT_SESSION_WOULD_BLOCK) { + return false; + } + if (peek_len >= 0) { return true; } } diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index ae6f60d1fe..410eb8aea7 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -1757,6 +1757,8 @@ void __NetAdhocInit() { config.num_threads = 0; // The port the relay client connects to. config.port = AEMU_POSTOFFICE_PORT; + // Disable ENet until the adhocctl side is ready + config.enable_enet = false; aemu_postoffice_server::Server relay_server(config); if (relay_server.pump() == aemu_postoffice_server::ServerPumpStatus::LISTEN_SOCK_DEAD) { diff --git a/ext/aemu_postoffice b/ext/aemu_postoffice index 89df7297a8..0b2d4e14e3 160000 --- a/ext/aemu_postoffice +++ b/ext/aemu_postoffice @@ -1 +1 @@ -Subproject commit 89df7297a8db658e71e29cd6102309725b779e21 +Subproject commit 0b2d4e14e3d61d14fcd1505b958e9007bab0d9e2