Skip to content

fix: Fix game hang when taking screenshots #528

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
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −11
Open

fix: Fix game hang when taking screenshots #528

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
15 changes: 4 additions & 11 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 @@ -592,7 +592,7 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
memcpy(pixelData.data(), pBits, height * pitch);

// process on thread - track the thread so we can join it during shutdown
std::thread* pNewThread = new std::thread([cbOnDataAvailable, width, height, pixelData = std::move(pixelData), pDXsurf, pitch, bResizeForTransmit]()
std::thread* pNewThread = new std::thread([cbOnDataAvailable, width, height, pixelData = std::move(pixelData), pitch, bResizeForTransmit]()
{
CHECK_WORKER_THREAD;

Expand Down Expand Up @@ -654,11 +654,6 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
delete[] rgbData;
rgbData = nullptr;

if (pDXsurf != nullptr)
{
pDXsurf->Release();
}

// invoke cb
if (cbOnDataAvailable != nullptr)
{
Expand Down Expand Up @@ -715,12 +710,10 @@ void NGMP_OnlineServicesManager::CaptureScreenshot(bool bResizeForTransmit, std:
surfaceCopy = nullptr;
}

if (!bSucceeded) // if success, thread uses this and then destroys it
if (pDXsurf != nullptr)
{
if (pDXsurf != nullptr)
{
pDXsurf->Release();
}
pDXsurf->Release();
pDXsurf = nullptr;
}

// callback if failed
Expand Down
Loading