cpp/openttd-patchpack/source Changeset - r27402:8e5c6e9c8a2d

Changeset - r27402:8e5c6e9c8a2d

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Patric Stout - 19 months ago 2023-05-21 10:57:32
truebrain@openttd.org

Fix: survey result on crash only worked on Linux (#10855)

Every OS-specific crashlog handler has their own MakeCrashLog
in some form. In result, only Linux was calling the generic one.

4 files changed with 13 insertions and 3 deletions:

src/crashlog.cpp

src/crashlog.h

src/os/macosx/crashlog_osx.cpp

src/os/windows/crashlog_win.cpp

0 comments (0 inline, 0 general)

src/crashlog.cpp

➞

Show inline comments

@@ @@ -454,6 +454,13 @@ bool CrashLog::WriteScreenshot(char *fil @@
 	return res;
+}
 void CrashLog::SendSurvey() const
+{
 	if (_game_mode == GM_NORMAL) {
 		_survey.Transmit(NetworkSurveyHandler::Reason::CRASH, true);
+	}
+}
 /**
  * Makes the crash log, writes it to a file and then subsequently tries
  * to make a crash dump and crash savegame. It uses DEBUG to write
@@ @@ -512,9 +519,7 @@ bool CrashLog::MakeCrashLog() const @@
 		printf("Writing crash screenshot failed.\n\n");
+	}
 	if (_game_mode == GM_NORMAL) {
 		_survey.Transmit(NetworkSurveyHandler::Reason::CRASH, true);
+	}
 	this->SendSurvey();
 	return ret;
+}

src/crashlog.h

➞

Show inline comments

@@ @@ -99,6 +99,8 @@ public: @@
 	bool WriteSavegame(char *filename, const char *filename_last) const;
 	bool WriteScreenshot(char *filename, const char *filename_last) const;
 	void SendSurvey() const;
 	bool MakeCrashLog() const;
 	/**

src/os/macosx/crashlog_osx.cpp

➞

Show inline comments

@@ @@ -192,6 +192,8 @@ public: @@
 			ret = false;
+		}
 		this->SendSurvey();
 		return ret;
+	}

src/os/windows/crashlog_win.cpp

➞

Show inline comments

@@ @@ -564,6 +564,7 @@ static LONG WINAPI ExceptionHandler(EXCE @@
 	log->AppendDecodedStacktrace(buf, lastof(log->crashlog));
 	log->WriteCrashLog(log->crashlog, log->crashlog_filename, lastof(log->crashlog_filename));
 	log->WriteScreenshot(log->screenshot_filename, lastof(log->screenshot_filename));
 	log->SendSurvey();
 	/* Close any possible log files */
 	CloseConsoleLogIfActive();

0 comments (0 inline, 0 general)