Merge branch 'master' into jgrpp

# Conflicts:
#	src/crashlog.cpp
#	src/gfx.cpp
#	src/network/network_client.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/saveload/saveload.cpp
#	src/survey.cpp
This commit is contained in:
Jonathan G Rennison
2024-03-16 18:06:09 +00:00
32 changed files with 857 additions and 749 deletions

View File

@@ -2780,7 +2780,10 @@ struct FileReader : LoadFilter {
/** Make sure everything is cleaned up. */
~FileReader()
{
if (this->file != nullptr) fclose(this->file);
if (this->file != nullptr) {
_game_session_stats.savegame_size = ftell(this->file) - this->begin;
fclose(this->file);
}
this->file = nullptr;
}
@@ -2829,7 +2832,10 @@ struct FileWriter : SaveFilter {
void Finish() override
{
if (this->file != nullptr) fclose(this->file);
if (this->file != nullptr) {
_game_session_stats.savegame_size = ftell(this->file);
fclose(this->file);
}
this->file = nullptr;
}
};