From b6c5f4937932029d8ebfd1654ed8d264e0e66de0 Mon Sep 17 00:00:00 2001
From: glx22 <glx@openttd.org>
Date: Wed, 22 Dec 2021 19:26:49 +0100
Subject: [PATCH] Change: add a timestamp in name of crash files

---
 src/crashlog.cpp                | 27 ++++++++++++++++++++++++---
 src/crashlog.h                  |  2 ++
 src/os/macosx/crashlog_osx.cpp  |  2 +-
 src/os/windows/crashlog_win.cpp |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index b7c8c2bc49..b0cda0adf1 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -324,6 +324,25 @@ char *CrashLog::LogRecentNews(char *buffer, const char *last) const
 	return buffer;
 }
 
+/**
+ * Create a timestamped filename.
+ * @param filename      The begin where to write at.
+ * @param filename_last The last position in the buffer to write to.
+ * @param ext           The extension for the filename.
+ * @param with_dir      Whether to prepend the filename with the personal directory.
+ * @return the number of added characters.
+ */
+int CrashLog::CreateFileName(char *filename, const char *filename_last, const char *ext, bool with_dir) const
+{
+	static std::string crashname;
+
+	if (crashname.empty()) {
+		UTCTime::Format(filename, filename_last, "crash%Y%m%d%H%M%S");
+		crashname = filename;
+	}
+	return seprintf(filename, filename_last, "%s%s%s", with_dir ? _personal_dir.c_str() : "", crashname.c_str(), ext);
+}
+
 /**
  * Fill the crash log buffer with all data of a crash log.
  * @param buffer The begin where to write at.
@@ -366,7 +385,7 @@ char *CrashLog::FillCrashLog(char *buffer, const char *last) const
  */
 bool CrashLog::WriteCrashLog(const char *buffer, char *filename, const char *filename_last) const
 {
-	seprintf(filename, filename_last, "%scrash.log", _personal_dir.c_str());
+	this->CreateFileName(filename, filename_last, ".log");
 
 	FILE *file = FioFOpenFile(filename, "w", NO_DIRECTORY);
 	if (file == nullptr) return false;
@@ -401,7 +420,7 @@ bool CrashLog::WriteSavegame(char *filename, const char *filename_last) const
 	try {
 		GamelogEmergency();
 
-		seprintf(filename, filename_last, "%scrash.sav", _personal_dir.c_str());
+		this->CreateFileName(filename, filename_last, ".sav");
 
 		/* Don't do a threaded saveload. */
 		return SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, NO_DIRECTORY, false) == SL_OK;
@@ -423,7 +442,9 @@ bool CrashLog::WriteScreenshot(char *filename, const char *filename_last) const
 	/* Don't draw when we have invalid screen size */
 	if (_screen.width < 1 || _screen.height < 1 || _screen.dst_ptr == nullptr) return false;
 
-	bool res = MakeScreenshot(SC_CRASHLOG, "crash");
+	this->CreateFileName(filename, filename_last, "", false);
+	bool res = MakeScreenshot(SC_CRASHLOG, filename);
+	filename[0] = '\0';
 	if (res) strecpy(filename, _full_screenshot_name, filename_last);
 	return res;
 }
diff --git a/src/crashlog.h b/src/crashlog.h
index 7d15c3512f..b7945a9839 100644
--- a/src/crashlog.h
+++ b/src/crashlog.h
@@ -85,6 +85,8 @@ protected:
 	char *LogGamelog(char *buffer, const char *last) const;
 	char *LogRecentNews(char *buffer, const char *list) const;
 
+	int CreateFileName(char *filename, const char *filename_last, const char *ext, bool with_dir = true) const;
+
 public:
 	/** Stub destructor to silence some compilers. */
 	virtual ~CrashLog() {}
diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp
index 7fcb672a81..682ed6d073 100644
--- a/src/os/macosx/crashlog_osx.cpp
+++ b/src/os/macosx/crashlog_osx.cpp
@@ -186,7 +186,7 @@ public:
 			ret = false;
 		}
 
-		printf("Writing crash savegame...\n");
+		printf("Writing crash screenshot...\n");
 		if (!this->WriteScreenshot(filename_screenshot, lastof(filename_screenshot))) {
 			filename_screenshot[0] = '\0';
 			ret = false;
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index 5ce04e52ed..e1a05a8aaf 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -490,7 +490,7 @@ char *CrashLogWindows::AppendDecodedStacktrace(char *buffer, const char *last) c
 				CONST PMINIDUMP_CALLBACK_INFORMATION);
 		MiniDumpWriteDump_t funcMiniDumpWriteDump = dbghelp.GetProcAddress("MiniDumpWriteDump");
 		if (funcMiniDumpWriteDump != nullptr) {
-			seprintf(filename, filename_last, "%scrash.dmp", _personal_dir.c_str());
+			this->CreateFileName(filename, filename_last, ".dmp");
 			HANDLE file  = CreateFile(OTTD2FS(filename).c_str(), GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, 0, 0);
 			HANDLE proc  = GetCurrentProcess();
 			DWORD procid = GetCurrentProcessId();