Skip to content

Fix: Check for null TheDownloadManager before using it #62

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

Merged
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

Fix: Check for null TheDownloadManager before using it #62

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
24 changes: 18 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 @@ -326,8 +326,11 @@ void NGMP_OnlineServicesManager::ContinueUpdate()
uint32_t downloadSize = m_vecFilesSizes.front();
m_vecFilesSizes.pop();

TheDownloadManager->SetFileName(AsciiString(strDownloadPath.c_str()));
TheDownloadManager->OnStatusUpdate(DOWNLOADSTATUS_DOWNLOADING);
if (TheDownloadManager != nullptr)
{
TheDownloadManager->SetFileName(AsciiString(strDownloadPath.c_str()));
TheDownloadManager->OnStatusUpdate(DOWNLOADSTATUS_DOWNLOADING);
}

// this isnt a super nice way of doing this, lets make a download manager
std::map<std::string, std::string> mapHeaders;
Expand All @@ -346,7 +349,10 @@ void NGMP_OnlineServicesManager::ContinueUpdate()
else
{
// set done
TheDownloadManager->OnProgressUpdate(downloadSize, downloadSize, 0, 0);
if (TheDownloadManager != nullptr)
{
TheDownloadManager->OnProgressUpdate(downloadSize, downloadSize, 0, 0);
}

m_vecFilesDownloaded.push_back(strDownloadPath);

Expand Down Expand Up @@ -378,14 +384,20 @@ void NGMP_OnlineServicesManager::ContinueUpdate()
{
//m_bytesReceivedSoFar += bytesReceived;

TheDownloadManager->OnProgressUpdate(bytesReceived, downloadSize, -1, -1);
if (TheDownloadManager != nullptr)
{
TheDownloadManager->OnProgressUpdate(bytesReceived, downloadSize, -1, -1);
}
}
);
}
else if (m_vecFilesToDownload.size() == 0 && m_vecFilesDownloaded.size() > 0) // nothing left but we did download something
{
TheDownloadManager->SetFileName("Update is complete!");
TheDownloadManager->OnStatusUpdate(DOWNLOADSTATUS_FINISHING);
if (TheDownloadManager != nullptr)
{
TheDownloadManager->SetFileName("Update is complete!");
TheDownloadManager->OnStatusUpdate(DOWNLOADSTATUS_FINISHING);
}

m_updateCompleteCallback();
}
Expand Down
Loading