mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use S6Exporter for crash handler

This commit is contained in:
Ted John 2017-02-08 22:17:01 +00:00
parent e2aebb2236
commit 5787a0bf90
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/platform/crash.cpp
View File

@ -18,6 +18,7 @@
#include "crash.h"
#ifdef USE_BREAKPAD
#include <memory>
#include <stdio.h>
#if defined(__WINDOWS__)
@ -28,13 +29,16 @@
#error Breakpad support not implemented yet for this platform
#endif
extern "C" {
extern "C"
{
#include "../localisation/language.h"
#include "../scenario/scenario.h"
#include "platform.h"
}
#include "../core/Console.hpp"
#include "../core/Exception.hpp"
#include "../rct2/S6Exporter.h"
#define WSZ(x) L"" x
@ -86,21 +90,25 @@ static bool OnCrash(const wchar_t * dumpPath,
wprintf(L"Version: %s\n", WSZ(OPENRCT2_VERSION));
wprintf(L"Commit: %s\n", _wszCommitSha1Short);
utf8 * saveFilePathUTF8 = widechar_to_utf8(saveFilePath);
SDL_RWops * rw = SDL_RWFromFile(saveFilePathUTF8, "wb+");
free(saveFilePathUTF8);
bool savedGameDumped = false;
if (rw != NULL) {
scenario_save(rw, 0x80000000);
utf8 * saveFilePathUTF8 = widechar_to_utf8(saveFilePath);
try
{
auto exporter = std::make_unique<S6Exporter>();
exporter->Export();
exporter->SaveGame(saveFilePathUTF8);
savedGameDumped = true;
SDL_RWclose(rw);
}
catch (const Exception &)
{
}
free(saveFilePathUTF8);
if (gOpenRCT2SilentBreakpad)
{
return succeeded;
}
constexpr const wchar_t * MessageFormat = L"A crash has occurred and a dump was created at\n%s.\n\nPlease file an issue with OpenRCT2 on GitHub, and provide the dump and saved game there.\n\nVersion: %s\nCommit: %s";
wchar_t message[MAX_PATH * 2];
swprintf_s(message,