[Pkg-owncloud-commits] [owncloud-client] 128/164: Completely disable the crash handler if the user disabled it

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0fccf5e50d667294fe5edcd3b69e4bddfeabae8a
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Wed Mar 11 15:34:53 2015 +0100

    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 6975a79..812b659 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git