mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 19:02:41 +01:00
Code Issues Releases Wiki Activity

Change: recover when possible from crashes during a crash (#11238)

Browse Source
This commit is contained in:
Patric Stout
2023-08-27 21:54:05 +02:00
committed by GitHub
parent 99e4a14cdf
commit b00e483b0f
5 changed files with 330 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/crashlog.cpp
View File

@@ -367,11 +367,12 @@ bool CrashLog::WriteCrashLog()
* Write the (crash) dump to a file.
*
* @note Sets \c crashdump_filename when there is a successful return.
* @return 1 iff the crashdump was successfully created, -1 if it failed, 0 if not implemented.
* @return True iff the crashdump was successfully created.
*/
/* virtual */ int CrashLog::WriteCrashDump()
/* virtual */ bool CrashLog::WriteCrashDump()
{
return 0;
fmt::print("No method to create a crash.dmp available.\n");
return false;
}
/**
@@ -443,7 +444,7 @@ bool CrashLog::MakeCrashLog()
fmt::print("Crash log generated.\n\n");
fmt::print("Writing crash log to disk...\n");
bool bret = this->WriteCrashLog();
bool bret = this->TryExecute("crashlog", [this]() { return this->WriteCrashLog(); });
if (bret) {
fmt::print("Crash log written to {}. Please add this file to any bug reports.\n\n", this->crashlog_filename);
} else {
@@ -452,18 +453,15 @@ bool CrashLog::MakeCrashLog()
}
fmt::print("Writing crash dump to disk...\n");
int dret = this->WriteCrashDump();
if (dret < 0) {
fmt::print("Writing crash dump failed.\n\n");
ret = false;
} else if (dret > 0) {
bret = this->TryExecute("crashdump", [this]() { return this->WriteCrashDump(); });
if (bret) {
fmt::print("Crash dump written to {}. Please add this file to any bug reports.\n\n", this->crashdump_filename);
} else {
fmt::print("Skipped; missing dependency to create crash dump.\n");
fmt::print("Writing crash dump failed.\n\n");
}
fmt::print("Writing crash savegame...\n");
bret = this->WriteSavegame();
bret = this->TryExecute("savegame", [this]() { return this->WriteSavegame(); });
if (bret) {
fmt::print("Crash savegame written to {}. Please add this file and the last (auto)save to any bug reports.\n\n", this->savegame_filename);
} else {
@@ -472,7 +470,7 @@ bool CrashLog::MakeCrashLog()
}
fmt::print("Writing crash screenshot...\n");
bret = this->WriteScreenshot();
bret = this->TryExecute("screenshot", [this]() { return this->WriteScreenshot(); });
if (bret) {
fmt::print("Crash screenshot written to {}. Please add this file to any bug reports.\n\n", this->screenshot_filename);
} else {
@@ -480,7 +478,7 @@ bool CrashLog::MakeCrashLog()
fmt::print("Writing crash screenshot failed.\n\n");
}
this->SendSurvey();
this->TryExecute("survey", [this]() { this->SendSurvey(); return true; });
return ret;
}