fixes #525 - using 'away' as ultimate fallback if no away reason is specified

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

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 722c3fc..8fe87b0 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -63,8 +63,12 @@ void UserInputHandler::handleAway(const BufferInfo &bufferInfo, const QString &m
 
   // if there is no message supplied we have to check if we are already away or not
   if(msg.isEmpty()) {
-    if(me && !me->isAway())
+    if(me && !me->isAway()) {
       awayMsg = network()->identityPtr()->awayReason();
+      if(awayMsg.isEmpty()) {
+       awayMsg = tr("away");
+      }
+    }
   }
   if(me)
     me->setAwayMessage(awayMsg);
@@ -321,12 +325,7 @@ void UserInputHandler::handleQuit(const BufferInfo &bufferInfo, const QString &m
 }
 
 void UserInputHandler::issueQuit(const QString &reason) {
-  QString quitReason;
-  if(reason.isEmpty())
-    quitReason = network()->identityPtr()->quitReason();
-  else
-    quitReason = reason;
-  emit putCmd("QUIT", serverEncode(quitReason));
+  emit putCmd("QUIT", serverEncode(reason));
 }
 
 void UserInputHandler::handleQuote(const BufferInfo &bufferInfo, const QString &msg) {