X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=a9798054f5cc427389b5bc151e678b549365c351;hb=7156691fecfbc44a67d0ec6055d2e892a7eb42de;hp=33b6cbd4c9bc2267df6441ac44a3aca8a16841a6;hpb=0a1c1ff4f99a7eb53ff6cdd95ce5d7ac263e77d2;p=quassel.git
diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 33b6cbd4..a9798054 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -49,8 +49,12 @@ QStringList Quassel::_dataDirPaths;
bool Quassel::_initialized = false;
bool Quassel::DEBUG = false;
QString Quassel::_coreDumpFileName;
+Quassel *Quassel::_instance = 0;
Quassel::Quassel() {
+ Q_ASSERT(!_instance);
+ _instance = this;
+
// We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
@@ -108,6 +112,10 @@ bool Quassel::init() {
return true;
}
+void Quassel::quit() {
+ QCoreApplication::quit();
+}
+
//! Register our custom types with Qt's Meta Object System.
/** This makes them available for QVariant and in signals/slots, among other things.
*
@@ -170,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-%2)")
+ _buildInfo.fancyVersionString = QString("v%1 (dist-%2)")
.arg(_buildInfo.baseVersion)
.arg(_buildInfo.commitHash.left(7))
.arg(_buildInfo.commitHash);
@@ -183,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-%3%4)")
- .arg(rx.cap(1), distance, rx.cap(3))
+ _buildInfo.fancyVersionString = QString("v%1 (%2git-%3%4)")
+ .arg(_buildInfo.baseVersion, distance, rx.cap(3))
.arg(_buildInfo.isSourceDirty ? "*" : "")
.arg(_buildInfo.commitHash);
}
@@ -207,7 +214,10 @@ void Quassel::handleSignal(int sig) {
case SIGTERM:
case SIGINT:
qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig)));
- QCoreApplication::quit();
+ if(_instance)
+ _instance->quit();
+ else
+ QCoreApplication::quit();
break;
case SIGABRT:
case SIGSEGV: