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

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

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index c90e7f6..926fc97 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -379,7 +379,6 @@ void CoreSession::clientsConnected() {
   Identity *identity = 0;
   CoreNetwork *net = 0;
   IrcUser *me = 0;
   Identity *identity = 0;
   CoreNetwork *net = 0;
   IrcUser *me = 0;

-  QString awayReason;

   while(netIter != _networks.end()) {
     net = *netIter;
     netIter++;
   while(netIter != _networks.end()) {
     net = *netIter;
     netIter++;


@@ -421,8 +420,6 @@ void CoreSession::clientsDisconnected() {
     if(identity->detachAwayEnabled() && !me->isAway()) {
       if(identity->detachAwayReasonEnabled())
        awayReason = identity->detachAwayReason();
     if(identity->detachAwayEnabled() && !me->isAway()) {
       if(identity->detachAwayReasonEnabled())
        awayReason = identity->detachAwayReason();

-      else
-       awayReason = identity->awayReason();

       net->setAutoAwayActive(true);
       net->userInputHandler()->handleAway(BufferInfo(), awayReason);
     }
       net->setAutoAwayActive(true);
       net->userInputHandler()->handleAway(BufferInfo(), awayReason);
     }