← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/gui/windows/chatwindow.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-12-02 13:52:14 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20131202135214-75nrorshqrxju2av
Tags: 1.3.11.24-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/windows/chatwindow.cpp
1495
1495
        }
1496
1496
    }
1497
1497
 
1498
 
    if (langChatTab && !channel.empty())
 
1498
    if (!channel.empty())
1499
1499
    {
1500
 
        if (langChatTab->getChannelName() == channel)
 
1500
        if (langChatTab)
1501
1501
        {
1502
 
            langChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors);
 
1502
            if (langChatTab->getChannelName() == channel)
 
1503
            {
 
1504
                langChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors);
 
1505
            }
 
1506
            else if (mShowAllLang)
 
1507
            {
 
1508
                langChatTab->chatLog(prefix + line, own,
 
1509
                    ignoreRecord, tryRemoveColors);
 
1510
            }
1503
1511
        }
1504
1512
        else if (mShowAllLang)
1505
1513
        {
1506
 
            langChatTab->chatLog(prefix + line, own,
 
1514
            localChatTab->chatLog(prefix + line, own,
1507
1515
                ignoreRecord, tryRemoveColors);
1508
1516
        }
1509
1517
    }