BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when cancelling download

Browse Source
This commit is contained in:
Lion Kortlepel 2024-09-22 20:20:31 +02:00
parent 007cd6573e
commit 1260515a40
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Network/Resources.cpp
View File

@ -214,6 +214,8 @@ std::vector<char> MultiDownload(SOCKET MSock, SOCKET DSock, uint64_t Size, const
if (MData.empty()) { if (MData.empty()) {
MultiKill(MSock, DSock); MultiKill(MSock, DSock);
Terminate = true;
Au.join();
return {}; return {};
} }
@ -221,6 +223,8 @@ std::vector<char> MultiDownload(SOCKET MSock, SOCKET DSock, uint64_t Size, const
if (DData.empty()) { if (DData.empty()) {
MultiKill(MSock, DSock); MultiKill(MSock, DSock);
Terminate = true;
Au.join();
return {}; return {};
} }
@ -228,6 +232,8 @@ std::vector<char> MultiDownload(SOCKET MSock, SOCKET DSock, uint64_t Size, const
GRcv = MData.size() + DData.size(); GRcv = MData.size() + DData.size();
if (GRcv != Size) { if (GRcv != Size) {
error("Something went wrong during download; didn't get enough data. Expected " + std::to_string(Size) + " bytes, got " + std::to_string(GRcv) + " bytes instead"); error("Something went wrong during download; didn't get enough data. Expected " + std::to_string(Size) + " bytes, got " + std::to_string(GRcv) + " bytes instead");
Terminate = true;
Au.join();
return {}; return {};
} }