From 0fccf5e50d667294fe5edcd3b69e4bddfeabae8a Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Wed, 11 Mar 2015 15:34:53 +0100 Subject: [PATCH] Completely disable the crash handler if the user disabled it The config currently only disable the reporter, but still leaves the crash handler installed on startup. This causes conflicts when running those builds in lldb. Work around the issue by requiring the crash reporter to be disabled in the settings before owncloud can be run in lldb. This has the negative side-effect of not covering the initial ConfigFile loading with the crash handler. Issue #2946 --- src/gui/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 6975a79e08..812b659aa9 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -61,9 +61,8 @@ int main(int argc, char **argv) #ifdef WITH_CRASHREPORTER - CrashReporter::Handler* handler = new CrashReporter::Handler( QDir::tempPath(), true, CRASHREPORTER_EXECUTABLE ); - ConfigFile cfgFile; - handler->setActive(cfgFile.crashReporter()); + if (ConfigFile().crashReporter()) + new CrashReporter::Handler( QDir::tempPath(), true, CRASHREPORTER_EXECUTABLE ); #endif #ifndef Q_OS_WIN