mirror of
https://git.outfoxxed.me/quickshell/quickshell.git
synced 2026-04-10 06:11:54 +10:00
crash: switch to cpptrace from breakpad
This commit is contained in:
parent
cddb4f061b
commit
cdde4c63f4
19 changed files with 372 additions and 173 deletions
|
|
@ -27,7 +27,7 @@
|
|||
#include "build.hpp"
|
||||
#include "launch_p.hpp"
|
||||
|
||||
#if CRASH_REPORTER
|
||||
#if CRASH_HANDLER
|
||||
#include "../crash/handler.hpp"
|
||||
#endif
|
||||
|
||||
|
|
@ -137,13 +137,12 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
|
|||
.display = getDisplayConnection(),
|
||||
};
|
||||
|
||||
#if CRASH_REPORTER
|
||||
auto crashHandler = crash::CrashHandler();
|
||||
crashHandler.init();
|
||||
#if CRASH_HANDLER
|
||||
crash::CrashHandler::init();
|
||||
|
||||
{
|
||||
auto* log = LogManager::instance();
|
||||
crashHandler.setRelaunchInfo({
|
||||
crash::CrashHandler::setRelaunchInfo({
|
||||
.instance = InstanceInfo::CURRENT,
|
||||
.noColor = !log->colorLogs,
|
||||
.timestamp = log->timestampLogs,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include "build.hpp"
|
||||
#include "launch_p.hpp"
|
||||
|
||||
#if CRASH_REPORTER
|
||||
#if CRASH_HANDLER
|
||||
#include "../crash/main.hpp"
|
||||
#endif
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ namespace qs::launch {
|
|||
namespace {
|
||||
|
||||
void checkCrashRelaunch(char** argv, QCoreApplication* coreApplication) {
|
||||
#if CRASH_REPORTER
|
||||
#if CRASH_HANDLER
|
||||
auto lastInfoFdStr = qEnvironmentVariable("__QUICKSHELL_CRASH_INFO_FD");
|
||||
|
||||
if (!lastInfoFdStr.isEmpty()) {
|
||||
|
|
@ -104,7 +104,7 @@ void exitDaemon(int code) {
|
|||
int main(int argc, char** argv) {
|
||||
QCoreApplication::setApplicationName("quickshell");
|
||||
|
||||
#if CRASH_REPORTER
|
||||
#if CRASH_HANDLER
|
||||
qsCheckCrash(argc, argv);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue