Merge pull request #11385 from liamwhite/acceptcancel

internal_network: cancel pending socket operations on application process termination

1 files changed, 2 insertions, 0 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index f075ae7fa2..2d6e613986 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -406,6 +406,7 @@ struct System::Impl {
             gpu_core->NotifyShutdown();
         }
 
+        Network::CancelPendingSocketOperations();
         kernel.SuspendApplication(true);
         if (services) {
             services->KillNVNFlinger();
@@ -427,6 +428,7 @@ struct System::Impl {
         debugger.reset();
         kernel.Shutdown();
         memory.Reset();
+        Network::RestartSocketOperations();
 
         if (auto room_member = room_network.GetRoomMember().lock()) {
             Network::GameInfo game_info{};