Skip to content

OnlineServices: Shutdown HTTP manager before WebSocket #74

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Open

OnlineServices: Shutdown HTTP manager before WebSocket #74

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
14 changes: 8 additions & 6 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,19 +263,21 @@ void NGMP_OnlineServicesManager::WaitForScreenshotThreads()

void NGMP_OnlineServicesManager::Shutdown()
{
// Shutdown HTTP manager FIRST to complete any pending requests
// This ensures all HTTP callbacks complete before we destroy other objects they might reference
if (m_pHTTPManager != nullptr)
{
m_pHTTPManager->Shutdown();
}

// Then shutdown WebSocket after HTTP callbacks have completed
if (m_pWebSocket)
{
m_pWebSocket->Shutdown();
// Reset shared_ptr, which will delete WebSocket only when all references are released
m_pWebSocket.reset();
}

// Then shutdown HTTP manager to complete any pending requests
if (m_pHTTPManager != nullptr)
{
m_pHTTPManager->Shutdown();
}

// Finally shutdown Sentry
ShutdownSentry();

Expand Down
Loading