X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=deaf20e057e33d32f44fb4353d92d87c94bc7235;hb=2baaaea16e777a1fe961d6cc4d34aa9dd323333e;hp=a43a707b21a5ac117aca8f22c4c794bcf5a13b91;hpb=8c16bc6817aac177791686ac1a5ad8ee2d93410c;p=quassel.git

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index a43a707b..deaf20e0 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -50,6 +50,7 @@ bool Quassel::_initialized = false;
 bool Quassel::DEBUG = false;
 QString Quassel::_coreDumpFileName;
 Quassel *Quassel::_instance = 0;
+bool Quassel::_handleCrashes = true;
 
 Quassel::Quassel() {
   Q_ASSERT(!_instance);
@@ -58,27 +59,6 @@ Quassel::Quassel() {
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handleSignal);
   signal(SIGINT, handleSignal);
-
-  // we have crashhandler for win32 and unix (based on execinfo).
-  // on mac os we use it's integrated backtrace generator
-#if defined(Q_OS_WIN32) || (defined(HAVE_EXECINFO) && !defined(Q_OS_MAC))
-
-# ifndef Q_OS_WIN32
-  // we only handle crashes ourselves if coredumps are disabled
-  struct rlimit *limit = (rlimit *) malloc(sizeof(struct rlimit));
-  int rc = getrlimit(RLIMIT_CORE, limit);
-
-  if(rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
-# endif
-    signal(SIGABRT, handleSignal);
-    signal(SIGSEGV, handleSignal);
-#   ifndef Q_OS_WIN32
-    signal(SIGBUS, handleSignal);
-  }
-  free(limit);
-#   endif
-
-#endif
 }
 
 Quassel::~Quassel() {
@@ -89,6 +69,26 @@ bool Quassel::init() {
   if(_initialized)
     return true;  // allow multiple invocations because of MonolithicApplication
 
+  if (_handleCrashes) {
+    // we have crashhandler for win32 and unix (based on execinfo).
+#if defined(Q_OS_WIN32) || defined(HAVE_EXECINFO)
+# ifndef Q_OS_WIN32
+    // we only handle crashes ourselves if coredumps are disabled
+    struct rlimit *limit = (rlimit *) malloc(sizeof(struct rlimit));
+    int rc = getrlimit(RLIMIT_CORE, limit);
+  
+    if(rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) {
+# endif /* Q_OS_WIN32 */
+      signal(SIGABRT, handleSignal);
+      signal(SIGSEGV, handleSignal);
+# ifndef Q_OS_WIN32
+      signal(SIGBUS, handleSignal);
+    }
+    free(limit);
+# endif /* Q_OS_WIN32 */
+#endif /* Q_OS_WIN32 || HAVE_EXECINFO */
+  }
+
   _initialized = true;
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
@@ -178,8 +178,7 @@ void Quassel::setupBuildInfo(const QString &generated) {
       _buildInfo.plainVersionString = QString("v%1 (dist-%2)")
                                         .arg(_buildInfo.baseVersion)
                                         .arg(_buildInfo.commitHash.left(7));
-                                        _buildInfo.fancyVersionString
-                                           = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
+      _buildInfo.fancyVersionString = QString("v%1 (dist-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%3\">%2</a>)")
                                         .arg(_buildInfo.baseVersion)
                                         .arg(_buildInfo.commitHash.left(7))
                                         .arg(_buildInfo.commitHash);
@@ -191,13 +190,13 @@ void Quassel::setupBuildInfo(const QString &generated) {
     // analyze what we got from git-describe
     QRegExp rx("(.*)-(\\d+)-g([0-9a-f]+)$");
     if(rx.exactMatch(_buildInfo.generatedVersion)) {
-      QString distance = rx.cap(2) == "0" ? QString() : QString(" [+%1]").arg(rx.cap(2));
-      _buildInfo.plainVersionString = QString("v%1%2 (git-%3%4)")
-                                        .arg(rx.cap(1), distance, rx.cap(3))
+      QString distance = rx.cap(2) == "0" ? QString() : QString("%1+%2 ").arg(rx.cap(1), rx.cap(2));
+      _buildInfo.plainVersionString = QString("v%1 (%2git-%3%4)")
+                                        .arg(_buildInfo.baseVersion, distance, rx.cap(3))
                                         .arg(_buildInfo.isSourceDirty ? "*" : "");
       if(!_buildInfo.commitHash.isEmpty()) {
-        _buildInfo.fancyVersionString = QString("v%1%2 (git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
-                                          .arg(rx.cap(1), distance, rx.cap(3))
+        _buildInfo.fancyVersionString = QString("v%1 (%2git-<a href=\"http://git.quassel-irc.org/?p=quassel.git;a=commit;h=%5\">%3</a>%4)")
+                                          .arg(_buildInfo.baseVersion, distance, rx.cap(3))
                                           .arg(_buildInfo.isSourceDirty ? "*" : "")
                                           .arg(_buildInfo.commitHash);
       }