From 4a743e9060e22adef0c593d77e332281e8b82468 Mon Sep 17 00:00:00 2001 From: R Date: Tue, 19 Aug 2025 14:35:55 -0700 Subject: [PATCH] Collect additional logs for crash handler (#2376) * Collect launcher.log on crashes This has been missing for Crash Handler based tspacks for a while, which makes it harder to get information from XLCore users because of our differing log names. (Really, we should rename both to just be xivlauncher.log or something, but that would break existing tooling) * Collect wine.log on crashes --- DalamudCrashHandler/DalamudCrashHandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DalamudCrashHandler/DalamudCrashHandler.cpp b/DalamudCrashHandler/DalamudCrashHandler.cpp index 62ccdd20a..ec7115ffd 100644 --- a/DalamudCrashHandler/DalamudCrashHandler.cpp +++ b/DalamudCrashHandler/DalamudCrashHandler.cpp @@ -463,12 +463,14 @@ void open_folder_and_select_items(HWND hwndOpener, const std::wstring& path) { void export_tspack(HWND hWndParent, const std::filesystem::path& logDir, const std::string& crashLog, const std::string& troubleshootingPackData) { static const char* SourceLogFiles[] = { - "output.log", + "output.log", // XIVLauncher for Windows + "launcher.log", // XIVLauncher.Core for [mostly] Linux "patcher.log", "dalamud.log", "dalamud.injector.log", "dalamud.boot.log", "aria.log", + "wine.log" }; static constexpr auto MaxSizePerLog = 1 * 1024 * 1024; static constexpr std::array OutputFileTypeFilterSpec{{