Save Core settings synchronously and report errors.

[quassel.git] / src / core / coresession.cpp

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 5c377c8..39bd69b 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -662,7 +662,7 @@ void CoreSession::clientsDisconnected()
 
         if (identity->detachAwayEnabled() && !me->isAway()) {
             if (!identity->detachAwayReason().isEmpty())
-                awayReason = identity->detachAwayReason();
+                awayReason = formatCurrentDateTimeInString(identity->detachAwayReason());
             net->setAutoAwayActive(true);
             net->userInputHandler()->handleAway(BufferInfo(), awayReason);
         }
@@ -670,7 +670,7 @@ void CoreSession::clientsDisconnected()
 }
 
 
-void CoreSession::globalAway(const QString &msg)
+void CoreSession::globalAway(const QString &msg, const bool skipFormatting)
 {
     QHash<NetworkId, CoreNetwork *>::iterator netIter = _networks.begin();
     CoreNetwork *net = 0;
@@ -681,7 +681,7 @@ void CoreSession::globalAway(const QString &msg)
         if (!net->isConnected())
             continue;
 
-        net->userInputHandler()->issueAway(msg, false /* no force away */);
+        net->userInputHandler()->issueAway(msg, false /* no force away */, skipFormatting);
     }
 }