mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 20:49:11 +00:00
Code Issues Activity

(svn r23234) -Fix [FS#4840]: crash when after downloading content

Browse Source
This commit is contained in:
rubidium
2011-11-16 16:54:37 +00:00
parent 6548ec6e9e
commit a3a2fdcfc2
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/network/network_content.cpp
View File

@@ -530,13 +530,41 @@ void ClientNetworkContentSocketHandler::AfterDownload()
if (GunzipFile(this->curInfo)) {
unlink(GetFullFilename(this->curInfo, true));
TarScanner ts;
ts.AddFile(GetFullFilename(this->curInfo, false), 0);
if (this->curInfo->type == CONTENT_TYPE_BASE_MUSIC) {
/* Music can't be in a tar. So extract the tar! */
ExtractTar(GetFullFilename(this->curInfo, false), BASESET_DIR);
unlink(GetFullFilename(this->curInfo, false));
} else {
Subdirectory sd = NO_DIRECTORY;
switch (this->curInfo->type) {
case CONTENT_TYPE_AI:
sd = AI_DIR;
break;
case CONTENT_TYPE_AI_LIBRARY:
sd = AI_LIBRARY_DIR;
break;
case CONTENT_TYPE_BASE_GRAPHICS:
case CONTENT_TYPE_BASE_SOUNDS:
case CONTENT_TYPE_BASE_MUSIC:
sd = BASESET_DIR;
break;
case CONTENT_TYPE_NEWGRF:
sd = NEWGRF_DIR;
break;
case CONTENT_TYPE_SCENARIO:
case CONTENT_TYPE_HEIGHTMAP:
sd = SCENARIO_DIR;
break;
default: NOT_REACHED();
}
TarScanner ts;
ts.AddFile(sd, GetFullFilename(this->curInfo, false));
}
this->OnDownloadComplete(this->curInfo->id);